e72f4f7f26
* chore: bump chromium in DEPS to 123.0.6300.2 * chore: bump chromium in DEPS to 123.0.6301.2 * chore: update patches * chore: bump chromium in DEPS to 123.0.6302.0 * chore: bump chromium in DEPS to 123.0.6304.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6306.2 * chore: update patches * chore: bump chromium in DEPS to 123.0.6308.0 * chore: update patches * Refactor //components/pdf/common constants https://chromium-review.googlesource.com/c/chromium/src/+/5292816 * Rename URLLoaderFactoryParams::is_corb_enabled to is_orb_enabled. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5277040 * Add placeholder of speaker-selection permission. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5278243 * Move kPdfMimeType to //components/pdf/common/constants.h Refs https://chromium-review.googlesource.com/c/chromium/src/+/5293155 * chore: gen-libc++-filenames.js * Make GetClassName non virtual Refs https://chromium-review.googlesource.com/c/chromium/src/+/5293075 Refs https://issues.chromium.org/issues/324596267 * chore: bump chromium in DEPS to 123.0.6310.0 * chore: update filenames.libcxx.gni * 5282732: Compute input region using correct pixel size. https://chromium-review.googlesource.com/c/chromium/src/+/5282732 * fixup: Make GetClassName non virtual * chore: bump chromium in DEPS to 123.0.6312.0 * chore: update patches * chore: bump chromium in DEPS to 123.0.6312.5 * fixup: Make GetClassName non virtual * docs: document speaker-selection https://chromium-review.googlesource.com/c/chromium/src/+/5278243 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
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
|
|
index d425af65b5ceebfdd718bf08113987e0c0bf7a6c..21b1a753386e4bb265a29d267fc11e241183686b 100644
|
|
--- a/buildtools/third_party/libc++/BUILD.gn
|
|
+++ b/buildtools/third_party/libc++/BUILD.gn
|
|
@@ -45,7 +45,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
|
|
@@ -53,6 +57,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 b5c15a0ead70604150a14820d8a829a5aa55f981..f1f984285e39192f5e1a8c5418c13915f5aa110a 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 {
|