Index: pylib/gyp/generator/ninja.py |
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py |
index 51c288b2164ff2e2b7aa337302ee946764b17be2..2ffa32830a3102457abcdf3ea5ee5b5c8c338ff5 100644 |
--- a/pylib/gyp/generator/ninja.py |
+++ b/pylib/gyp/generator/ninja.py |
@@ -921,6 +921,11 @@ class NinjaWriter(object): |
os.environ.get('CFLAGS', '').split() + cflags_c) |
cflags_cc = (os.environ.get('CPPFLAGS', '').split() + |
os.environ.get('CXXFLAGS', '').split() + cflags_cc) |
+ elif self.toolset == 'host': |
scottmg
2015/09/24 21:30:51
why is this is in this CL?
lindleyf
2015/09/24 21:47:14
I could move that to a different CL if you prefer.
scottmg
2015/09/24 21:59:09
yes, if it's unrelated, it should be a separate ch
lindleyf
2015/09/24 22:10:26
Okay, reverted. I'll do this separately.
|
+ cflags_c = (os.environ.get('CPPFLAGS_host', '').split() + |
+ os.environ.get('CFLAGS_host', '').split() + cflags_c) |
+ cflags_cc = (os.environ.get('CPPFLAGS_host', '').split() + |
+ os.environ.get('CXXFLAGS_host', '').split() + cflags_cc) |
defines = config.get('defines', []) + extra_defines |
self.WriteVariableList(ninja_file, 'defines', |
@@ -1672,7 +1677,7 @@ def CommandWithWrapper(cmd, wrappers, prog): |
def GetDefaultConcurrentLinks(): |
"""Returns a best-guess for a number of concurrent links.""" |
- pool_size = int(os.getenv('GYP_LINK_CONCURRENCY', 0)) |
+ pool_size = int(os.environ.get('GYP_LINK_CONCURRENCY', 0)) |
if pool_size: |
return pool_size |
@@ -1699,7 +1704,7 @@ def GetDefaultConcurrentLinks(): |
# VS 2015 uses 20% more working set than VS 2013 and can consume all RAM |
# on a 64 GB machine. |
mem_limit = max(1, stat.ullTotalPhys / (5 * (2 ** 30))) # total / 5GB |
- hard_cap = max(1, int(os.getenv('GYP_LINK_CONCURRENCY_MAX', 2**32))) |
+ hard_cap = max(1, int(os.environ.get('GYP_LINK_CONCURRENCY_MAX', 2**32))) |
return min(mem_limit, hard_cap) |
elif sys.platform.startswith('linux'): |
if os.path.exists("/proc/meminfo"): |
@@ -2277,7 +2282,8 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params, |
if flavor == 'mac': |
gyp.xcode_emulation.MergeGlobalXcodeSettingsToSpec(data[build_file], spec) |
- build_file = gyp.common.RelativePath(build_file, options.toplevel_dir) |
+ build_file = gyp.common.RelativePath(build_file, options.toplevel_dir, |
+ False) |
qualified_target_for_hash = gyp.common.QualifiedTarget(build_file, name, |
toolset) |