зеркало из https://github.com/electron/electron.git
chore: remove add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch (#15692)
This commit is contained in:
Родитель
565e4c5910
Коммит
bc9a7806a5
|
@ -27,7 +27,6 @@ webview_cross_drag.patch
|
|||
worker_context_will_destroy.patch
|
||||
browser_plugin_guest.patch
|
||||
disable_user_gesture_requirement_for_beforeunload_dialogs.patch
|
||||
add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
|
||||
gin_enable_disable_v8_platform.patch
|
||||
blink-worker-enable-csp-in-file-scheme.patch
|
||||
disable-redraw-lock.patch
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksei Kuzmin <alkuzmin@microsoft.com>
|
||||
Date: Thu, 20 Sep 2018 17:47:36 -0700
|
||||
Subject: add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
|
||||
|
||||
|
||||
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
||||
index 7fb93868d6e009323eceb2ba0f1ff9c506dc5f3b..53c5744953da460c02b43de1bfd184cd92489167 100644
|
||||
--- a/base/BUILD.gn
|
||||
+++ b/base/BUILD.gn
|
||||
@@ -1248,7 +1248,7 @@ jumbo_component("base") {
|
||||
# Needed for <atomic> if using newer C++ library than sysroot, except if
|
||||
# building inside the cros_sdk environment - use host_toolchain as a
|
||||
# more robust check for this.
|
||||
- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) &&
|
||||
+ if ((is_android || (is_linux && !is_chromecast)) &&
|
||||
host_toolchain != "//build/toolchain/cros:host") {
|
||||
libs += [ "atomic" ]
|
||||
}
|
Загрузка…
Ссылка в новой задаче