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 069fdba14a56808c8db3cf76c8245dff527b0add..4a20bed0985b0f4200a7e88f9f85ad93cb7dd6c3 100644 --- a/buildtools/third_party/libc++/BUILD.gn +++ b/buildtools/third_party/libc++/BUILD.gn @@ -44,7 +44,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 @@ -52,6 +56,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) { diff --git a/buildtools/third_party/libc++abi/BUILD.gn b/buildtools/third_party/libc++abi/BUILD.gn index b1895ae3b8ddf5820d3dd0c294bd8b36d4b43dc7..38d32a0b11d7cf5c33ef9a481caa6dc58d2ccfde 100644 --- a/buildtools/third_party/libc++abi/BUILD.gn +++ b/buildtools/third_party/libc++abi/BUILD.gn @@ -6,7 +6,7 @@ import("//build/config/android/config.gni") import("//build/config/c++/c++.gni") import("//build/config/unwind.gni") -source_set("libc++abi") { +static_library("libc++abi") { if (export_libcxxabi_from_executables) { visibility = [ "//build/config:executable_deps" ] } else {