diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-02-05 21:26:52 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-02-05 21:26:52 (GMT) |
| commit | bc4f7bf75271601d7fcec04109bf1e4af4c66ad5 (patch) | |
| tree | 23d9d9fa5d1a8d8a2b32e6c024db8d8ce0f5a6e0 /configure.py | |
| parent | a4d4787de199694d3d36f50bf18d82a9124d4b03 (diff) | |
| parent | 2f127fab680c44977190e45af82ce23215369a96 (diff) | |
| download | Ninja-bc4f7bf75271601d7fcec04109bf1e4af4c66ad5.zip Ninja-bc4f7bf75271601d7fcec04109bf1e4af4c66ad5.tar.gz Ninja-bc4f7bf75271601d7fcec04109bf1e4af4c66ad5.tar.bz2 | |
Merge pull request #1106 from nico/winfix
win: Only drop /showIncludes in bootstrap builds.
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/configure.py b/configure.py index 92d0573..f0e452f 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): @@ -315,10 +317,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'] |