daohualiuxiang
/
node
mirror of https://github.com/nodejs/node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <christopher.s.dickinson@gmail.com>
pull/296/merge
Rod Vagg 2015-01-12 15:49:55 +11:00
parent 0cca6fe74a
commit 70c2501373
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -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))