diff options
| author | Bruce Dawson <randomascii@users.noreply.github.com> | 2022-02-17 00:06:15 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 00:06:15 (GMT) |
| commit | 34d03bd3db07f7cae57016eee0b60b4ebe5baecc (patch) | |
| tree | 12e7703f8c2562ca25686a93e887f44e38c62c7d /configure.py | |
| parent | 87b8965080693f084e5784efde234b127711d8c1 (diff) | |
| parent | f404f0059d71c8c86da7b56c48794266b5befd10 (diff) | |
| download | Ninja-34d03bd3db07f7cae57016eee0b60b4ebe5baecc.zip Ninja-34d03bd3db07f7cae57016eee0b60b4ebe5baecc.tar.gz Ninja-34d03bd3db07f7cae57016eee0b60b4ebe5baecc.tar.bz2 | |
Merge branch 'ninja-build:master' into compiler_detect
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.py b/configure.py index c0d6712..fcc987c 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() @@ -488,7 +488,7 @@ def has_re2c(): return False if has_re2c(): n.rule('re2c', - command='re2c -b -i --no-generation-date -o $out $in', + command='re2c -b -i --no-generation-date --no-version -o $out $in', description='RE2C $out') # Generate the .cc files in the source directory so we can check them in. n.build(src('depfile_parser.cc'), 're2c', src('depfile_parser.in.cc')) |