Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(341)

Unified Diff: base/BUILD.gn

Issue 2823303003: base: remove -latomic in CrOS chroot (Closed)
Patch Set: Fold if statement to outer level, improve inline documentation Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 7714190534fc23bd8b879ffb3e119916d6c144d3..ccc9647d446f5614bae0b4fc5ed9a6fe5a9c588e 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1128,8 +1128,11 @@ component("base") {
":debugging_flags",
]
- # Needed for <atomic> if using newer C++ library than sysroot
- if (!use_sysroot && (is_android || (is_linux && !is_chromecast))) {
+ # 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)) &&
+ host_toolchain != "//build/toolchain/cros:host") {
libs = [ "atomic" ]
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698