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

Unified Diff: build/gyp_chromium

Issue 31143002: mac: Use ninja by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 2 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/landmine_utils.py » ('j') | chrome/installer/mac/dirdiffer.sh » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gyp_chromium
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 67e60cd648270f653a27fe395f5384842bc4d218..1fa030fdd16517c1123a953d1d2710ab5049cfbe 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -138,11 +138,15 @@ if __name__ == '__main__':
args.append('--no-circular-check')
# Default to ninja on linux, but only if no generator has explicitly been set.
+ # Also default to ninja on mac, but only when not building chrome/ios.
# . -f / --format has precedence over the env var, no need to check for it
# . set the env var only if it hasn't been set yet
# . chromium.gyp_env has been applied to os.environ at this point already
if sys.platform.startswith('linux') and not os.environ.get('GYP_GENERATORS'):
os.environ['GYP_GENERATORS'] = 'ninja'
+ elif sys.platform == 'darwin' and not os.environ.get('GYP_GENERATORS') and \
+ not 'OS=ios' in os.environ.get('GYP_DEFINES'):
+ os.environ['GYP_GENERATORS'] = 'ninja'
# If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check
# to enfore syntax checking.
« no previous file with comments | « no previous file | build/landmine_utils.py » ('j') | chrome/installer/mac/dirdiffer.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698