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
|
2022-11-17 19:59:23 +00:00
|
|
|
index 21421aa32047dc1479693c5a5f7aa209aafa05d3..ed1972a765574bdc380ea0670b45906ad66aca69 100644
|
2021-05-22 18:48:38 +00:00
|
|
|
--- a/buildtools/third_party/libc++/BUILD.gn
|
|
|
|
|
+++ b/buildtools/third_party/libc++/BUILD.gn
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -44,7 +44,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
|
2022-02-25 18:17:35 +00:00
|
|
|
@@ -52,6 +56,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-03-31 02:03:58 +00:00
|
|
|
index 3ab30c4f8776b9b60e736e69c9bfbce99263ff97..3e8ed18b836f863deafd28a6363b7de2bcdc1863 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
|
|
|
|
|
@@ -4,7 +4,7 @@
|
|
|
|
|
|
|
|
|
|
import("//build/config/c++/c++.gni")
|
|
|
|
|
|
|
|
|
|
-source_set("libc++abi") {
|
|
|
|
|
+static_library("libc++abi") {
|
|
|
|
|
if (export_libcxxabi_from_executables) {
|
2023-03-31 02:03:58 +00:00
|
|
|
visibility = [
|
|
|
|
|
"//build/config:executable_deps",
|
