From 70c2501373cdc2cf58a927823891e14054063136 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Mon, 12 Jan 2015 15:49:55 +1100 Subject: [PATCH] build: move armv6 snapshot test to configure_arm() fails on windows because is_arch_armv6() calls CC to get properties, so moved to a scope where we know we're at least on ARM PR-URL: https://github.com/iojs/io.js/pull/296 Reviewed-By: Chris Dickinson --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 289b25c..4b1fdb5 100755 --- a/configure +++ b/configure @@ -436,6 +436,10 @@ def configure_arm(o): o['variables']['arm_thumb'] = 0 # -marm o['variables']['arm_float_abi'] = arm_float_abi + # Print warning when snapshot is enabled and building on armv6 + if is_arch_armv6() and not options.without_snapshot: + print '\033[1;33mWarning!! When building on ARMv6 use --without-snapshot\033[1;m' + def configure_node(o): if options.dest_os == 'android': @@ -944,8 +948,4 @@ else: gyp_args += args -#print warning when snapshot is enabled and building on armv6 -if (is_arch_armv6()) and (not options.without_snapshot): - print '\033[1;33mWarning!! When building on ARMv6 use --without-snapshot\033[1;m' - sys.exit(subprocess.call(gyp_args)) -- 2.7.4