X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.py;h=f0e452f9caeca5351e35a1f25f951c37d35d0908;hb=bc4f7bf75271601d7fcec04109bf1e4af4c66ad5;hp=92d0573ccfc19e11f54c00ef2154829947b0bd37;hpb=a4d4787de199694d3d36f50bf18d82a9124d4b03;p=platform%2Fupstream%2Fninja.git

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']