mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
ae630f45b8
* chore: bump chromium in DEPS to 93.0.4562.0
* chore: update patches
* [base] Made Value::Take{Dict,List}() rvalue ref-qualified.
https://chromium-review.googlesource.com/c/chromium/src/+/2988105
* Revert "Reland "Roll src/buildtools/third_party/libc++/trunk/ 8fa879467..79a2e924d (426 commits)""
https://chromium-review.googlesource.com/c/chromium/src/+/2995482
This reverts commit 9691d6c265 and 797723ec83
* Pass gfx::Insets to GetHTComponentForFrame
https://chromium-review.googlesource.com/c/chromium/src/+/2984243
* chore: bump chromium in DEPS to 93.0.4563.0
* chore: bump chromium in DEPS to 93.0.4564.0
* chore: bump chromium in DEPS to 93.0.4565.0
* chore: bump chromium in DEPS to 93.0.4566.0
* [Clipboard API] Clipboard Custom Formats implementation Part 2.
https://chromium-review.googlesource.com/c/chromium/src/+/2967649
(cherry picked from commit 607ca0a09b)
* Prevent use of base::NoDestructor for trivially-destructible types
https://chromium-review.googlesource.com/c/chromium/src/+/2998672
(cherry picked from commit 3983afda29)
* fixup! [Clipboard API] Clipboard Custom Formats implementation Part 2.
(cherry picked from commit 3a1dbc649c)
* chore: add missing header
(cherry picked from commit a291f4864e)
* chore: update patches
* ci: do not run clipboard tests on WOA
(cherry picked from commit 0e3aedfbde)
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: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
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 0dd09de1ac6474aecf1d5b3086638825df094967..da648d20ec590671ed2afaf0694272cbcc397da1 100644
|
|
--- a/buildtools/third_party/libc++/BUILD.gn
|
|
+++ b/buildtools/third_party/libc++/BUILD.gn
|
|
@@ -32,7 +32,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
|
|
@@ -40,6 +44,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 {
|