From 58c7139b9f404e18097d4f3ef6adcd49a01e3d73 Mon Sep 17 00:00:00 2001 From: Evan Martin Date: Sun, 6 Jan 2013 15:33:46 -0800 Subject: [PATCH] windows: drop use of msvc helper in build --- bootstrap.py | 4 +--- configure.py | 12 +++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/bootstrap.py b/bootstrap.py index fcf1a20..4d9bc84 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -143,9 +143,7 @@ Done! Note: to work around Windows file locking, where you can't rebuild an in-use binary, to run ninja after making any changes to build ninja itself -you should run ninja.bootstrap instead. Your build is also configured to -use ninja.bootstrap.exe as the MSVC helper; see the --with-ninja flag of -the --help output of configure.py.""") +you should run ninja.bootstrap instead.""") else: print('Building ninja using itself...') run([sys.executable, 'configure.py'] + conf_args) 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', -- 2.7.4