Skip to content

Commit

Permalink
build: move armv6 snapshot test to configure_arm()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
rvagg committed Jan 12, 2015
1 parent 0cca6fe commit 70c2501
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand Down Expand Up @@ -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))

0 comments on commit 70c2501

Please sign in to comment.