Skip to content

Commit

Permalink
Use ninja as the default GYP generator on FreeBSD.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
r.c.ladan@gmail.com committed Mar 4, 2014
1 parent 37aeabe commit 38570ff
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions build/gyp_chromium
Original file line number Diff line number Diff line change
Expand Up @@ -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', []):
Expand Down

0 comments on commit 38570ff

Please sign in to comment.