mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
de679a181a
* chore: bump chromium in DEPS to 93.0.4567.0 * chore: update patches * chore: bump chromium in DEPS to 93.0.4568.0 * chore: bump chromium in DEPS to 93.0.4569.0 * chore: update patches (cherry picked from commit e710b8ea15f0ec08966e89d37e6ff73414180e6b) * 3000931: Code health: remove base::ListValue from DevToolsEmbedderMessageDispatcher https://chromium-review.googlesource.com/c/chromium/src/+/3000931 (cherry picked from commit 44c00b98f27621f6345bcf5d78f3e2649147135b) * chore: bump chromium in DEPS to 93.0.4570.0 * chore: update patches * chore: bump chromium in DEPS to 93.0.4571.0 * chore: update patches * chore: bump chromium in DEPS to 93.0.4573.0 * chore: bump chromium in DEPS to 93.0.4574.0 * chore: bump chromium in DEPS to 93.0.4575.0 * chore: bump chromium in DEPS to 93.0.4576.0 * chore: bump chromium in DEPS to 93.0.4577.0 * chore: bump chromium in DEPS to 93.0.4577.3 * chore: bump chromium in DEPS to 93.0.4577.4 * 3011898: Reland "Roll src/buildtools/third_party/libc++/trunk/ 8fa879467..79a2e924d (426 commits)" https://chromium-review.googlesource.com/c/chromium/src/+/3011898 (cherry picked from commitc46148eed8) * 2974072: Swap base/stl_util.h to base/cxx17_backports.h in many files. https://chromium-review.googlesource.com/c/chromium/src/+/2974072 (cherry picked from commit4d725e44ca) * chore: add missing header (cherry picked from commitf3993e71ce) * Reland "Roll src/buildtools/third_party/libc++/trunk/ 8fa879467..79a2e924d (426 commits)" https://chromium-review.googlesource.com/c/chromium/src/+/2988699 (cherry picked from commit797723ec83) (cherry picked from commit4a325c9b24) * 2925476: Migrate t/b/{public,renderer}/platform/media to blink ns [4/6] https://chromium-review.googlesource.com/c/chromium/src/+/2925476 (cherry picked from commit0930c0ee41) * 2974074: Remove base/cxx17_backports.h from stl_util.h. https://chromium-review.googlesource.com/c/chromium/src/+/2974074 (cherry picked from commita7b53b61f4) * fixup: 2974074: Remove base/cxx17_backports.h from stl_util.h. (cherry picked from commitaf5da4dcb1) * chore: update patches * fix: invalid operands compilation error (cherry picked from commit6fa6f8acb9) * 3001416: Fix -Wimplicit-int-float-conversion. https://chromium-review.googlesource.com/c/chromium/src/+/3001416 (cherry picked from commitb2e9f2212e) * 3022548: Removing windows.h includes from some base headers https://chromium-review.googlesource.com/c/chromium/src/+/3022548 (cherry picked from commit8b48103907) * 3029258: Remove unused JobEventDetails::Type enum values https://chromium-review.googlesource.com/c/chromium/src/+/3029258 Cherry picked fromc15df3a109Co-Authored-By: Shelley Vohr <shelley.vohr@gmail.com> * 3029185: printing: Use mojom::PrinterType instead of PrinterType https://chromium-review.googlesource.com/c/chromium/src/+/3029185 (cherry picked from commitd16fab76fb) * Update application_info_win.cc (cherry picked from commit6e187f8617) * include windows.h in process_singleton_win.cc (cherry picked from commitaf58ad2d9d) * chore: bump chromium in DEPS to 93.0.4577.8 * chore: update patches * do not create a new UserScriptManager every time the accessor is called (cherry picked from commit24a71035ab) * chore: Revert "Roll clang llvmorg-13-init-14732-g8a7b5ebf-2 : llvmorg-13-init-15040-gc10947b5-1" * chore: remove no longer needed patch * Update the "py" wheel to a version that is compatible with pytest-6.2.2. https://chromium-review.googlesource.com/c/chromium/src/+/3044950 * chore: bump chromium in DEPS to 93.0.4577.15 * chore: update patches * chore: fixup parallel/test-errors-systemerror node test Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
47 lines
1.7 KiB
Diff
47 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 01d122aa78f15e0c94b1ee8ae54e08dace0aca0d..5ed9952afd4f4331c98ad41b7d79936794056ce8 100644
|
|
--- a/buildtools/third_party/libc++/BUILD.gn
|
|
+++ b/buildtools/third_party/libc++/BUILD.gn
|
|
@@ -41,7 +41,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
|
|
@@ -49,6 +53,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 {
|