summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorTimothy J Fontaine <tjfontaine@gmail.com>2013-12-06 20:58:00 -0800
committerTimothy J Fontaine <tjfontaine@gmail.com>2013-12-06 21:07:00 -0800
commitb5e161989cc3551ad7ec3723801a696fdbbf1525 (patch)
tree1c529834b4230072b6effba047a289c8aa1d6d37 /configure
parent5cfee927cd09dc9e74e2bc1d7454284d90831456 (diff)
downloadandroid-node-v8-b5e161989cc3551ad7ec3723801a696fdbbf1525.tar.gz
android-node-v8-b5e161989cc3551ad7ec3723801a696fdbbf1525.tar.bz2
android-node-v8-b5e161989cc3551ad7ec3723801a696fdbbf1525.zip
build: ./configure pass positional args to gyp
use `--` to specify the arguments you want to pass directly to gyp. for example: `./configure -- --no-parallel -Dsome_define=foo` fixes #6370
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure14
1 files changed, 9 insertions, 5 deletions
diff --git a/configure b/configure
index 1a56c0db35..0053b8de70 100755
--- a/configure
+++ b/configure
@@ -695,13 +695,17 @@ config = '\n'.join(map('='.join, config.iteritems())) + '\n'
write('config.mk',
'# Do not edit. Generated by the configure script.\n' + config)
+gyp_args = [sys.executable, 'tools/gyp_node.py']
+
if options.use_ninja:
- gyp_args = ['-f', 'ninja-' + flavor]
+ gyp_args += ['-f', 'ninja-' + flavor]
elif options.use_xcode:
- gyp_args = ['-f', 'xcode']
+ gyp_args += ['-f', 'xcode']
elif flavor == 'win':
- gyp_args = ['-f', 'msvs', '-G', 'msvs_version=auto']
+ gyp_args += ['-f', 'msvs', '-G', 'msvs_version=auto']
else:
- gyp_args = ['-f', 'make-' + flavor]
+ gyp_args += ['-f', 'make-' + flavor]
+
+gyp_args += args
-subprocess.call([sys.executable, 'tools/gyp_node.py'] + gyp_args)
+subprocess.call(gyp_args)