summaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorJan Niklas Hasse <jhasse@bixense.com>2021-11-16 13:36:21 (GMT)
committerJan Niklas Hasse <jhasse@bixense.com>2021-11-16 13:36:21 (GMT)
commitf4afae640f2477a8d0bf2495ea304ccd19c499af (patch)
tree2f1e67a79a2fbcff9ed9b482512911b7fc92a693 /configure.py
parentd0cc2383dd0da65ff0b0855bc6f2f53251f8cccf (diff)
parent90fc541a8162e80ea75d47972be3146fdfbe2b84 (diff)
downloadNinja-f4afae640f2477a8d0bf2495ea304ccd19c499af.zip
Ninja-f4afae640f2477a8d0bf2495ea304ccd19c499af.tar.gz
Ninja-f4afae640f2477a8d0bf2495ea304ccd19c499af.tar.bz2
Merge branch 'master' into googletest
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.py b/configure.py
index ed56fab..541dcf7 100755
--- a/configure.py
+++ b/configure.py
@@ -84,7 +84,7 @@ class Platform(object):
return self._platform == 'msvc'
def msvc_needs_fs(self):
- popen = subprocess.Popen(['cl', '/nologo', '/?'],
+ popen = subprocess.Popen(['cl', '/nologo', '/help'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
out, err = popen.communicate()
@@ -507,12 +507,15 @@ for name in ['build',
'eval_env',
'graph',
'graphviz',
+ 'json',
'lexer',
'line_printer',
'manifest_parser',
'metrics',
+ 'missing_deps',
'parser',
'state',
+ 'status',
'string_piece_util',
'util',
'version']: