summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-31 06:18:11 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-31 06:18:11 +0000
commit7a29680b81b983ac1da1b5fdbe3ad096bad7015a (patch)
tree413e25223dbb6b4d3d8c90f1b294d91df584fe96
parentbac1b5e651cb6930e163b5c6e8821642d3220da9 (diff)
downloadchromium_src-7a29680b81b983ac1da1b5fdbe3ad096bad7015a.zip
chromium_src-7a29680b81b983ac1da1b5fdbe3ad096bad7015a.tar.gz
chromium_src-7a29680b81b983ac1da1b5fdbe3ad096bad7015a.tar.bz2
mac: Don't crash in build/gyp_chromium if GYP_DEFINES isn't set.
BUG=294387 TBR=mark Review URL: https://codereview.chromium.org/51113011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232015 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xbuild/gyp_chromium2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 1fa030f..b165f70 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -145,7 +145,7 @@ if __name__ == '__main__':
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'):
+ 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