Skip to content
Browse files

Merge pull request #1106 from nico/winfix

win: Only drop /showIncludes in bootstrap builds.
  • Loading branch information...
2 parents a4d4787 + 2f127fa commit bc4f7bf75271601d7fcec04109bf1e4af4c66ad5 @nico nico committed
Showing with 3 additions and 5 deletions.
  1. +3 −5 configure.py
View
8 configure.py
@@ -133,7 +133,9 @@ def newline(self):
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 @@ def binary(name):
'/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']

0 comments on commit bc4f7bf

Please sign in to comment.
Something went wrong with that request. Please try again.