summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2016-02-05 18:28:56 (GMT)
committerNico Weber <thakis@chromium.org>2016-02-05 18:28:56 (GMT)
commit2f127fab680c44977190e45af82ce23215369a96 (patch)
treed6c5fa12caa6e8e6580150ef6230974463992118
parent207ff58e44294a8ce7df044b9b01f96799a972ac (diff)
downloadNinja-2f127fab680c44977190e45af82ce23215369a96.zip
Ninja-2f127fab680c44977190e45af82ce23215369a96.tar.gz
Ninja-2f127fab680c44977190e45af82ce23215369a96.tar.bz2
win: Only drop /showIncludes in bootstrap builds.
Fixes #1103.
-rwxr-xr-xconfigure.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/configure.py b/configure.py
index 0710ea2..b9c5f57 100755
--- a/configure.py
+++ b/configure.py
@@ -133,7 +133,9 @@ class Bootstrap:
return self.writer.newline()
def variable(self, key, val):
- self.vars[key] = self._expand(val)
+ # In bootstrap mode, we have no ninja process to catch /showIncludes
+ # output.
+ self.vars[key] = self._expand(val).replace('/showIncludes', '')
return self.writer.variable(key, val)
def rule(self, name, **kwargs):
@@ -308,10 +310,6 @@ if platform.is_msvc():
'/DNOMINMAX', '/D_CRT_SECURE_NO_WARNINGS',
'/D_HAS_EXCEPTIONS=0',
'/DNINJA_PYTHON="%s"' % options.with_python]
- if options.bootstrap:
- # In bootstrap mode, we have no ninja process to catch /showIncludes
- # output.
- cflags.remove('/showIncludes')
if platform.msvc_needs_fs():
cflags.append('/FS')
ldflags = ['/DEBUG', '/libpath:$builddir']