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

Unified Diff: build/toolchain/toolchain.gni

Issue 2209713002: Fix compilation with Xcode version of clang. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « build/toolchain/mac/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/toolchain.gni
diff --git a/build/toolchain/toolchain.gni b/build/toolchain/toolchain.gni
index fbaf48066840ae7f51436e87ff8e52b23091fc4f..1f32ebd38c24a7c19915b328e07b1b07a2b1f475 100644
--- a/build/toolchain/toolchain.gni
+++ b/build/toolchain/toolchain.gni
@@ -49,8 +49,10 @@ declare_args() {
}
}
-assert(!use_xcode_clang || is_ios,
- "Using Xcode's clang is only supported in iOS builds")
+if (current_toolchain == default_toolchain) {
+ assert(!use_xcode_clang || is_ios,
+ "Using Xcode's clang is only supported in iOS builds")
+}
Dirk Pranke 2016/08/03 16:49:50 This is probably relatively harmless (or even a go
sdefresne 2016/08/03 17:03:40 The changes in build/toolchain/mac/BUILD.gn only c
# Subdirectory within root_out_dir for shared library files.
# TODO(agrieve): GYP sets this to "lib" for Linux & Android, but this won't work
« no previous file with comments | « build/toolchain/mac/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698