2021-05-22 18:48:38 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: VerteDinde <keeleymhammond@gmail.com>
|
|
|
|
|
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
|
2024-01-25 17:46:30 +00:00
|
|
|
index 70d0876e5a5351b81005a3cf5ffd7f7d3143db2e..a7a39d74d311797263fe25a8df295dc6178fdc7a 100644
|
2021-05-22 18:48:38 +00:00
|
|
|
--- a/buildtools/third_party/libc++/BUILD.gn
|
|
|
|
|
+++ b/buildtools/third_party/libc++/BUILD.gn
|
2024-01-03 08:52:49 +00:00
|
|
|
@@ -45,7 +45,11 @@ config("winver") {
|
2021-05-22 18:48:38 +00:00
|
|
|
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
|
2024-01-03 08:52:49 +00:00
|
|
|
@@ -53,6 +57,7 @@ target(_libcxx_target_type, "libc++") {
|
2021-05-22 18:48:38 +00:00
|
|
|
# need to explicitly depend on libc++.
|
|
|
|
|
visibility = [
|
|
|
|
|
"//build/config:common_deps",
|
2021-05-24 00:10:54 +00:00
|
|
|
+ "//electron:libcxx_objects_zip",
|
2021-05-22 18:48:38 +00:00
|
|
|
"//third_party/catapult/devil:devil",
|
|
|
|
|
]
|
2022-04-12 11:19:14 +00:00
|
|
|
if (is_linux) {
|
2021-05-22 18:48:38 +00:00
|
|
|
diff --git a/buildtools/third_party/libc++abi/BUILD.gn b/buildtools/third_party/libc++abi/BUILD.gn
|
2023-08-15 15:49:41 +00:00
|
|
|
index b5c15a0ead70604150a14820d8a829a5aa55f981..f1f984285e39192f5e1a8c5418c13915f5aa110a 100644
|
2021-05-22 18:48:38 +00:00
|
|
|
--- a/buildtools/third_party/libc++abi/BUILD.gn
|
|
|
|
|
+++ b/buildtools/third_party/libc++abi/BUILD.gn
|
2023-07-31 17:47:32 +00:00
|
|
|
@@ -6,7 +6,7 @@ import("//build/config/android/config.gni")
|
2021-05-22 18:48:38 +00:00
|
|
|
import("//build/config/c++/c++.gni")
|
2023-07-31 17:47:32 +00:00
|
|
|
import("//build/config/unwind.gni")
|
2021-05-22 18:48:38 +00:00
|
|
|
|
|
|
|
|
-source_set("libc++abi") {
|
|
|
|
|
+static_library("libc++abi") {
|
|
|
|
|
if (export_libcxxabi_from_executables) {
|
2023-05-23 19:58:58 +00:00
|
|
|
visibility = [ "//build/config:executable_deps" ]
|
|
|
|
|
} else {
|
