Index: pylib/gyp/generator/ninja.py |
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py |
index 7659930ad134e77d48fb1ae8432a267fc742683c..51c288b2164ff2e2b7aa337302ee946764b17be2 100644 |
--- a/pylib/gyp/generator/ninja.py |
+++ b/pylib/gyp/generator/ninja.py |
@@ -921,11 +921,6 @@ 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': |
- 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', |
@@ -1677,7 +1672,7 @@ def CommandWithWrapper(cmd, wrappers, prog): |
def GetDefaultConcurrentLinks(): |
"""Returns a best-guess for a number of concurrent links.""" |
- pool_size = int(os.environ.get('GYP_LINK_CONCURRENCY', 0)) |
+ pool_size = int(os.getenv('GYP_LINK_CONCURRENCY', 0)) |
if pool_size: |
return pool_size |
@@ -1704,7 +1699,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.environ.get('GYP_LINK_CONCURRENCY_MAX', 2**32))) |
+ hard_cap = max(1, int(os.getenv('GYP_LINK_CONCURRENCY_MAX', 2**32))) |
return min(mem_limit, hard_cap) |
elif sys.platform.startswith('linux'): |
if os.path.exists("/proc/meminfo"): |