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 65f6e8585ad374ad59e7670babfedd2fbdfbaa43..7928a03447347f441e1e7dfc43f7a8e475eb120b 100644 --- a/buildtools/third_party/libc++/BUILD.gn +++ b/buildtools/third_party/libc++/BUILD.gn @@ -32,7 +32,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 @@ -40,6 +44,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 8b1da01ce87ff6db8e67938d4c083312cfa3101f..1668eba70db1933a434709c0140fe125991249b3 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 {