build: move armv6 snapshot test to configure_arm()
authorRod Vagg <rod@vagg.org>
Mon, 12 Jan 2015 04:49:55 +0000 (15:49 +1100)
committerRod Vagg <rod@vagg.org>
Mon, 12 Jan 2015 05:05:15 +0000 (16:05 +1100)
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 <christopher.s.dickinson@gmail.com>
configure

index 289b25c..4b1fdb5 100755 (executable)
--- 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))