summaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-12-27 20:15:32 (GMT)
committerEvan Martin <martine@danga.com>2011-12-27 20:15:32 (GMT)
commit67a2c3c58f74701d52c3a95fdbcedd30461e9908 (patch)
treeb270156db982e107be654c6f36ab3f61ffe3f32b /configure.py
parentcfb7dc6a2c0b95d218a728cbcee8bf17951f381f (diff)
parent075847031b6cf7b9de3bb7c42648a74d168a752b (diff)
downloadNinja-67a2c3c58f74701d52c3a95fdbcedd30461e9908.zip
Ninja-67a2c3c58f74701d52c3a95fdbcedd30461e9908.tar.gz
Ninja-67a2c3c58f74701d52c3a95fdbcedd30461e9908.tar.bz2
Merge branch 'master' of git://github.com/ehird/ninja
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.py b/configure.py
index 6111588..2e044c1 100755
--- a/configure.py
+++ b/configure.py
@@ -42,6 +42,9 @@ parser.add_option('--profile', metavar='TYPE',
help='enable profiling (' + '/'.join(profilers) + ')',)
parser.add_option('--with-gtest', metavar='PATH',
help='use gtest unpacked in directory PATH')
+parser.add_option('--with-python', metavar='EXE',
+ help='use EXE as the Python interpreter',
+ default=os.path.basename(sys.executable))
(options, args) = parser.parse_args()
platform = options.platform
@@ -87,7 +90,8 @@ cflags = ['-g', '-Wall', '-Wextra',
'-Wno-deprecated',
'-Wno-unused-parameter',
'-fno-exceptions',
- '-fvisibility=hidden', '-pipe']
+ '-fvisibility=hidden', '-pipe',
+ "'-DNINJA_PYTHON=\"%s\"'" % (options.with_python,)]
if not options.debug:
cflags += ['-O2', '-DNDEBUG']
ldflags = ['-L$builddir']
@@ -271,7 +275,7 @@ n.newline()
if host != 'mingw':
n.comment('Regenerate build files if build script changes.')
n.rule('configure',
- command='./configure.py $configure_args',
+ command=options.with_python + ' configure.py $configure_args',
generator=True)
n.build('build.ninja', 'configure',
implicit=['configure.py', 'misc/ninja_syntax.py'])