mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore: remove add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch (#15692)

Browse source
This commit is contained in:
Jeremy Apthorp 2018-11-13 10:00:25 -08:00 committed by GitHub
parent 565e4c5910
commit bc9a7806a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
patches/common/chromium/.patches
View file

@ -27,7 +27,6 @@ webview_cross_drag.patch
worker_context_will_destroy.patch worker_context_will_destroy.patch
browser_plugin_guest.patch browser_plugin_guest.patch
disable_user_gesture_requirement_for_beforeunload_dialogs.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 gin_enable_disable_v8_platform.patch
blink-worker-enable-csp-in-file-scheme.patch blink-worker-enable-csp-in-file-scheme.patch
disable-redraw-lock.patch disable-redraw-lock.patch

19
patches/common/chromium/add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
View file

@ -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" ]
}