summaryrefslogtreecommitdiffstats
path: root/build/gyp_chromium
diff options
context:
space:
mode:
authorr.c.ladan@gmail.com <r.c.ladan@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 22:32:02 +0000
committerr.c.ladan@gmail.com <r.c.ladan@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 22:32:02 +0000
commit38570ffd6ba24f096077ea6275613b43939c0931 (patch)
tree62cc93892389ea45eaeb9009477fdc73f78c20a8 /build/gyp_chromium
parent37aeabefcffb36f4fa4819f6391ee3a01535b08e (diff)
downloadchromium_src-38570ffd6ba24f096077ea6275613b43939c0931.zip
chromium_src-38570ffd6ba24f096077ea6275613b43939c0931.tar.gz
chromium_src-38570ffd6ba24f096077ea6275613b43939c0931.tar.bz2
Use ninja as the default GYP generator on FreeBSD.
While here, consistently use a single 'if' statement to set this environment variable. BUG= Review URL: https://codereview.chromium.org/176843005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
-rwxr-xr-xbuild/gyp_chromium5
1 files changed, 2 insertions, 3 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium
index e8e069b..5ada989 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -524,9 +524,8 @@ if __name__ == '__main__':
# . -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'):
+ if sys.platform.startswith(('linux', 'win', 'freebsd')) 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', []):