![electron-roller[bot]](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 122.0.6239.2 * chore: update patches * refactor: extensions replaced StringPiece with string_view Ref:5171926
* chore: bump chromium in DEPS to 122.0.6240.0 * chore: update patches * chore: bump chromium in DEPS to 122.0.6241.5 * chore: bump chromium in DEPS to 122.0.6245.0 * chore: bump chromium in DEPS to 122.0.6247.0 * chore: bump chromium in DEPS to 122.0.6249.0 * chore: bump chromium in DEPS to 122.0.6251.0 * 5192010: Rename {absl => std}::optional in //chrome/5192010
* 5109767: CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton5109767
* 5105227: [media_preview] Show requested device in permission bubble5105227
* chore: bump chromium in DEPS to 122.0.6253.0 * chore: update patches * 5180720: Polish tiled browser window UI on Linux |5180720
* chore: update patches * chore: bump chromium in DEPS to 122.0.6255.0 * chore: update patches * 5186276: [autopip] Make "allow once" per navigation |5186276
* chore: bump chromium in DEPS to 122.0.6257.0 * chore: bump chromium in DEPS to 122.0.6259.0 * chore: update patches * 5190661: Automated T* -> raw_ptr<T> rewrite "refresh" |5190661
* 5206106: Make sure RenderFrameHosts are active when printing |5206106
* 5202674: Reland "Automated T* -> raw_ptr<T> rewrite 'refresh'"5202674
* fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton5109767
* fixup 5206106: Make sure RenderFrameHosts are active when printing * Make legacy ToV8() helpers private to ScriptPromiseResolver, their only user5207474
* fixup CodeHealth: Fix leaked raw_ptr in Linux ProcessSingleton * fixup 5186276: [autopip] Make "allow once" per navigation5186276
* chore: update patches after rebase * chore: bump chromium in DEPS to 122.0.6260.0 * 5191363: Mark LOG(FATAL) [[noreturn]]5191363
* fixup 5186276: [autopip] Make "allow once" per navigation5186276
* fixup Make legacy ToV8() helpers private to ScriptPromiseResolver5207474
* chore: update patches * chore: bump chromium in DEPS to 122.0.6261.0 * chore: update patches * chore: restore patch that was mistakenly removed * 5181931: Improve LoginHandler (Part 9 / N)5181931
* Dispatch SiteInstanceGotProcess() only when both process and site are set.5142354
* 5171446: [AsyncSB] Pass navigation_id into CreateURLLoaderThrottles5171446
* 5213708: Move DownloadTargetInfo into components/download5213708
* extensions: Add a loader for Controlled Frame embedder scripts5202765
* [CSC][Zoom] Add initial_zoom_level to DisplayMediaInformation5168626
* chore: bump chromium in DEPS to 123.0.6262.0 * chore: bump chromium in DEPS to 122.0.6261.6 * fix: suppress clang -Wimplicit-const-int-float-conversion * fixup 5191363: Mark LOG(FATAL) [[noreturn]] for Windows5191363
* 5167921: Remove Widget::IsTranslucentWindowOpacitySupported5167921
Also 5148392: PinnedState: Support pinned state in PlatformWindowState |5148392
* fixup: 5180720: Polish tiled browser window UI on Linux5180720
* 5170669: clipboard: Migrate DOMException constructors to RejectWith-5170669
* 5178824: [Fullscreen] Record UKM data5178824
* chore: update patches after rebase --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> 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 70d0876e5a5351b81005a3cf5ffd7f7d3143db2e..a7a39d74d311797263fe25a8df295dc6178fdc7a 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 {
|