Index: pylib/gyp/generator/ninja.py |
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py |
index 92bdc13cc942e4624cac418c83c930bf74787ef9..9918e1c38e4936e5a80e3a69ff96f38d5f1d3065 100644 |
--- a/pylib/gyp/generator/ninja.py |
+++ b/pylib/gyp/generator/ninja.py |
@@ -1557,7 +1557,9 @@ def GetDefaultConcurrentLinks(): |
mem_limit = max(1, stat.ullTotalPhys / (4 * (2 ** 30))) # total / 4GB |
hard_cap = max(1, int(os.getenv('GYP_LINK_CONCURRENCY_MAX', 2**32))) |
- return min(mem_limit, hard_cap) |
+ # return min(mem_limit, hard_cap) |
+ # TODO(scottmg): Temporary speculative fix for OOM on builders |
Nico
2014/01/09 20:22:00
tracking bug for doing this right?
|
+ return 2 |
elif sys.platform.startswith('linux'): |
with open("/proc/meminfo") as meminfo: |
memtotal_re = re.compile(r'^MemTotal:\s*(\d*)\s*kB') |