reactos/ninja
1
0
Fork 0
mirror of https://github.com/reactos/ninja.git synced 2025-02-21 12:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1106 from nico/winfix

Browse Source 
win: Only drop /showIncludes in bootstrap builds.
This commit is contained in:
Nico Weber 2016-02-05 16:26:52 -05:00
commit bc4f7bf752
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.py
View File

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