diff options
author | Evan Martin <martine@danga.com> | 2013-04-09 15:57:02 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2013-04-09 15:57:02 (GMT) |
commit | 8b9e3eaf7e7d2af4539eae167f92993f5ab84b86 (patch) | |
tree | 82582c0928cb33e12b4d0a6c68f7bd06ff5a9301 /configure.py | |
parent | 76c8b11b0ad1c62ecdaa45fd553a6ac69c213663 (diff) | |
parent | 0a2fc151976277d8c0319cdc4ee3b1932b673d91 (diff) | |
download | Ninja-8b9e3eaf7e7d2af4539eae167f92993f5ab84b86.zip Ninja-8b9e3eaf7e7d2af4539eae167f92993f5ab84b86.tar.gz Ninja-8b9e3eaf7e7d2af4539eae167f92993f5ab84b86.tar.bz2 |
Merge branch 'dep-pipeless'
This merges a new mechanism for tracking "depfile" dependencies that
is faster on all platforms but dramatically so on Windows.
Diffstat (limited to 'configure.py')
-rwxr-xr-x | configure.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/configure.py b/configure.py index 6db181c..dd26906 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', + deps='msvc') else: n.rule('cxx', command='$cxx -MMD -MT $out -MF $out.d $cflags -c $in -o $out', @@ -269,6 +263,7 @@ for name in ['build', 'build_log', 'clean', 'depfile_parser', + 'deps_log', 'disk_interface', 'edit_distance', 'eval_env', @@ -346,6 +341,7 @@ for name in ['build_log_test', 'build_test', 'clean_test', 'depfile_parser_test', + 'deps_log_test', 'disk_interface_test', 'edit_distance_test', 'graph_test', |