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 3956cb73cdde75a2778fba1a9fae456e890a7b5e..deb7ceab1d8fffb4300d3a168d86f5d1236caa9d 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 8316e2754db29d96121d72bc4ef43313ec5760ba..225f05272d435bea47c02b0cc166291c0ba39244 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 {