From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: VerteDinde Date: Wed, 12 May 2021 13:19:19 -0700 Subject: build_libc++_as_static_library Build libc++ as static library to compile and pass nan tests diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn index 48f0bdb17e0a35f6e4d6fa236cd6077910ac76c6..5c95b14441c5604bc14418e4bbaf3df877652b2a 100644 --- a/buildtools/third_party/libc++/BUILD.gn +++ b/buildtools/third_party/libc++/BUILD.gn @@ -41,7 +41,11 @@ config("winver") { if (libcxx_is_shared) { _libcxx_target_type = "shared_library" } else { - _libcxx_target_type = "source_set" + if (is_win) { + _libcxx_target_type = "source_set" + } else { + _libcxx_target_type = "static_library" + } } target(_libcxx_target_type, "libc++") { # Most things that need to depend on libc++ should do so via the implicit @@ -49,6 +53,7 @@ target(_libcxx_target_type, "libc++") { # need to explicitly depend on libc++. visibility = [ "//build/config:common_deps", + "//electron:libcxx_objects_zip", "//third_party/catapult/devil:devil", ] if (is_linux && !is_chromeos) { diff --git a/buildtools/third_party/libc++abi/BUILD.gn b/buildtools/third_party/libc++abi/BUILD.gn index 1b0bea340d6e8aec153add6f184e382172916f8b..f5a8193e6b72f4cc039b95783be7d254b93911d8 100644 --- a/buildtools/third_party/libc++abi/BUILD.gn +++ b/buildtools/third_party/libc++abi/BUILD.gn @@ -4,7 +4,7 @@ import("//build/config/c++/c++.gni") -source_set("libc++abi") { +static_library("libc++abi") { if (export_libcxxabi_from_executables) { visibility = [ "//build/config:executable_deps" ] } else {