Skip to content

Commit

Permalink
windows: drop use of msvc helper in build
Browse files Browse the repository at this point in the history
  • Loading branch information
evmar committed Apr 8, 2013
1 parent ce65cb9 commit 58c7139
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
4 changes: 1 addition & 3 deletions bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,7 @@ def run(*args, **kwargs):
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)
Expand Down
12 changes: 3 additions & 9 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
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)
Expand Down Expand Up @@ -190,14 +187,11 @@ def shell_escape(str):
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',
Expand Down

0 comments on commit 58c7139

Please sign in to comment.