summaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-12-20 19:01:04 (GMT)
committerEvan Martin <martine@danga.com>2011-12-20 19:01:04 (GMT)
commit8ecbf8400a9e5336d027640463068331a435db32 (patch)
treede221312c5879a316d8c0e3efbadf0e1e189fa10 /configure.py
parent7a6eb9c5345fe30515d0a25c3ee105ae34b4c438 (diff)
downloadNinja-8ecbf8400a9e5336d027640463068331a435db32.zip
Ninja-8ecbf8400a9e5336d027640463068331a435db32.tar.gz
Ninja-8ecbf8400a9e5336d027640463068331a435db32.tar.bz2
fix mingw cross-compile
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 c342677..6b4c0d3 100755
--- a/configure.py
+++ b/configure.py
@@ -32,6 +32,9 @@ profilers = ['gmon', 'pprof']
parser.add_option('--platform',
help='target platform (' + '/'.join(platforms) + ')',
choices=platforms)
+parser.add_option('--host',
+ help='host platform (' + '/'.join(platforms) + ')',
+ choices=platforms)
parser.add_option('--debug', action='store_true',
help='enable debugging flags',)
parser.add_option('--profile', metavar='TYPE',
@@ -50,6 +53,7 @@ if platform is None:
platform = 'freebsd'
elif platform.startswith('mingw') or platform.startswith('win'):
platform = 'mingw'
+host = options.host or platform
BUILD_FILENAME = 'build.ninja'
buildfile = open(BUILD_FILENAME, 'w')
@@ -89,7 +93,7 @@ if platform == 'mingw':
cflags.remove('-fvisibility=hidden');
cflags.append('-Igtest-1.6.0/include')
ldflags.append('-Lgtest-1.6.0/lib/.libs')
- ldflags.extend(['-static'])
+ ldflags.append('-static')
else:
if options.profile == 'gmon':
cflags.append('-pg')
@@ -111,7 +115,7 @@ n.rule('cxx',
description='CXX $out')
n.newline()
-if platform != 'mingw':
+if host != 'mingw':
n.rule('ar',
command='rm -f $out && $ar crs $out $in',
description='AR $out')