diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 05:08:41 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 05:08:41 +0000 |
| commit | 87518c38642407ef9c553ccba0b37a844ab3e2ba (patch) | |
| tree | 8c8edc1232467f7ce102548653f53748018ce424 /build/gyp_chromium | |
| parent | d6bbe40d71565275f0ac7589ed7701179064cab1 (diff) | |
| download | chromium_src-87518c38642407ef9c553ccba0b37a844ab3e2ba.zip chromium_src-87518c38642407ef9c553ccba0b37a844ab3e2ba.tar.gz chromium_src-87518c38642407ef9c553ccba0b37a844ab3e2ba.tar.bz2 | |
win: Use ninja by default
With this change, `gclient runhooks` creates ninja files by default on
Windows. To build, run `ninja -C out\Release chrome`. The output appears
in out\ instead of build\.
If you need to use a VS build for some reason, you can still
`set GYP_GENERATORS=msvs`. This is no longer a tested configuration.
Bots should automatically pick up the binaries in the new location (out).
If something does break, it should be safe to revert this change, and bots
should then automatically go back to picking up binaries from the old
location (build).
R=thakis@chromium.org
BUG=303291
Review URL: https://codereview.chromium.org/111183004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
| -rwxr-xr-x | build/gyp_chromium | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index fd33545..c9611ef 100755 --- a/build/gyp_chromium +++ b/build/gyp_chromium @@ -324,13 +324,16 @@ if __name__ == '__main__': if sys.platform not in ('darwin',): args.append('--no-circular-check') - # Default to ninja on linux, but only if no generator has explicitly been set. + # Default to ninja on linux and windows, 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' + if sys.platform.startswith('win') 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' |