Skip to content

Commit 70c2501

Browse files
committed
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: #296 Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
1 parent 0cca6fe commit 70c2501

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,10 @@ def configure_arm(o):
436436
o['variables']['arm_thumb'] = 0 # -marm
437437
o['variables']['arm_float_abi'] = arm_float_abi
438438

439+
# Print warning when snapshot is enabled and building on armv6
440+
if is_arch_armv6() and not options.without_snapshot:
441+
print '\033[1;33mWarning!! When building on ARMv6 use --without-snapshot\033[1;m'
442+
439443

440444
def configure_node(o):
441445
if options.dest_os == 'android':
@@ -944,8 +948,4 @@ else:
944948

945949
gyp_args += args
946950

947-
#print warning when snapshot is enabled and building on armv6
948-
if (is_arch_armv6()) and (not options.without_snapshot):
949-
print '\033[1;33mWarning!! When building on ARMv6 use --without-snapshot\033[1;m'
950-
951951
sys.exit(subprocess.call(gyp_args))

0 commit comments

Comments
 (0)