diff options
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/configure.py b/configure.py index 8f5a497..eddf248 100755 --- a/configure.py +++ b/configure.py @@ -47,9 +47,6 @@ parser.add_option('--with-gtest', metavar='PATH', parser.add_option('--with-python', metavar='EXE', help='use EXE as the Python interpreter', default=os.path.basename(sys.executable)) -parser.add_option('--with-ninja', metavar='NAME', - help="name for ninja binary for -t msvc (MSVC only)", - default="ninja") (options, args) = parser.parse_args() if args: print('ERROR: extra unparsed command-line arguments:', args) @@ -190,14 +187,11 @@ n.variable('ldflags', ' '.join(shell_escape(flag) for flag in ldflags)) n.newline() if platform == 'windows': - compiler = '$cxx' - if options.with_ninja: - compiler = ('%s -t msvc -o $out -- $cxx /showIncludes' % - options.with_ninja) n.rule('cxx', - command='%s $cflags -c $in /Fo$out' % compiler, + command='$cxx /showIncludes $cflags -c $in /Fo$out', depfile='$out.d', - description='CXX $out') + description='CXX $out', + special='msvc') else: n.rule('cxx', command='$cxx -MMD -MT $out -MF $out.d $cflags -c $in -o $out', |