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

Unified Diff: build/config/BUILDCONFIG.gn

Issue 141433015: GN build fixes, mostly for Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: put back sha1 file Created 6 years, 11 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 | build/config/clang/BUILD.gn » ('j') | build/config/clang/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/BUILDCONFIG.gn
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index c4a57b076f73723ca6060984df3e6e9a11337e5d..38da66cef0ffbafed63f5dde29eb0adb68fb0989 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -161,6 +161,11 @@ if (os == "win") {
is_nacl = false
is_posix = true
is_win = false
+ if (!is_clang) {
+ # Always use clang on iOS when using ninja
+ # (which is always true when using GN).
Nico 2014/01/27 19:42:27 This isn't correct: gn will generate a re2.gyp fil
+ is_clang = true
+ }
} else if (os == "linux") {
is_android = false
is_chromeos = false
« no previous file with comments | « no previous file | build/config/clang/BUILD.gn » ('j') | build/config/clang/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698