diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-02-20 11:47:03 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-02-20 11:47:03 +0100 |
| commit | 4af673e161138fbed287a8e00cf7b2b0aafdd8b3 (patch) | |
| tree | 90fb82bb98fdbcbb0c86c446e029c13bf999c8b0 /tools/gyp/pylib/gyp/generator/dump_dependency_json.py | |
| parent | 7ae0d473a6b6ac8cb3e55d665528667566cd8e60 (diff) | |
| download | android-node-v8-4af673e161138fbed287a8e00cf7b2b0aafdd8b3.tar.gz android-node-v8-4af673e161138fbed287a8e00cf7b2b0aafdd8b3.tar.bz2 android-node-v8-4af673e161138fbed287a8e00cf7b2b0aafdd8b3.zip | |
gyp: update to r1214
Diffstat (limited to 'tools/gyp/pylib/gyp/generator/dump_dependency_json.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/dump_dependency_json.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/gyp/pylib/gyp/generator/dump_dependency_json.py b/tools/gyp/pylib/gyp/generator/dump_dependency_json.py index 1e0900a231..c1c2fbdc98 100644 --- a/tools/gyp/pylib/gyp/generator/dump_dependency_json.py +++ b/tools/gyp/pylib/gyp/generator/dump_dependency_json.py @@ -20,15 +20,15 @@ for unused in ['RULE_INPUT_PATH', 'RULE_INPUT_ROOT', 'RULE_INPUT_NAME', 'RULE_INPUT_DIRNAME', 'RULE_INPUT_EXT', 'EXECUTABLE_PREFIX', 'EXECUTABLE_SUFFIX', 'STATIC_LIB_PREFIX', 'STATIC_LIB_SUFFIX', - 'SHARED_LIB_PREFIX', 'SHARED_LIB_SUFFIX', - 'LINKER_SUPPORTS_ICF']: + 'SHARED_LIB_PREFIX', 'SHARED_LIB_SUFFIX']: generator_default_variables[unused] = '' def CalculateVariables(default_variables, params): generator_flags = params.get('generator_flags', {}) - default_variables['OS'] = generator_flags.get( - 'os', gyp.common.GetFlavor(params)) + for key, val in generator_flags.items(): + default_variables.setdefault(key, val) + default_variables.setdefault('OS', gyp.common.GetFlavor(params)) def CalculateGeneratorInputInfo(params): |