diff options
author | Evan Martin <martine@danga.com> | 2012-07-27 17:05:20 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2012-07-27 17:20:16 (GMT) |
commit | 238b5616c54a0b702eec36dd8168d6ec1cbdde80 (patch) | |
tree | b71dba5770d4357e41ede4efdea1742cbd6881ff | |
parent | ce7e2b2171c82fe2b8649afea852d272d1abcbcd (diff) | |
download | Ninja-238b5616c54a0b702eec36dd8168d6ec1cbdde80.zip Ninja-238b5616c54a0b702eec36dd8168d6ec1cbdde80.tar.gz Ninja-238b5616c54a0b702eec36dd8168d6ec1cbdde80.tar.bz2 |
mingw: fix quoting of -DNINJA_PYTHON
-rwxr-xr-x | configure.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.py b/configure.py index b8c6d86..df1d6bb 100755 --- a/configure.py +++ b/configure.py @@ -111,7 +111,7 @@ if platform == 'windows': cflags = ['/nologo', '/Zi', '/W4', '/WX', '/wd4530', '/wd4100', '/wd4706', '/wd4512', '/wd4800', '/wd4702', '/wd4819', '/GR-', '/DNOMINMAX', '/D_CRT_SECURE_NO_WARNINGS', - "/DNINJA_PYTHON=\"%s\"" % (options.with_python,)] + '/DNINJA_PYTHON="%s"' % options.with_python] ldflags = ['/DEBUG', '/libpath:$builddir'] if not options.debug: cflags += ['/Ox', '/DNDEBUG', '/GL'] @@ -123,7 +123,7 @@ else: '-fno-rtti', '-fno-exceptions', '-fvisibility=hidden', '-pipe', - "-DNINJA_PYTHON=\"%s\"" % options.with_python] + '-DNINJA_PYTHON="%s"' % options.with_python] if options.debug: cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC'] else: @@ -150,7 +150,7 @@ else: def shell_escape(str): """Escape str such that it's interpreted as a single argument by the shell.""" # This isn't complete, but it's just enough to make NINJA_PYTHON work. - if platform == 'windows': + if platform in ('windows', 'mingw'): return str if '"' in str: return "'%s'" % str.replace("'", "\\'") |