1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: allow x86_64 as a dest_cpu alias for x64

Browse Source 
x86_64 is a standard arch descriptor on Linux, allow it as an alias for
our preferred descriptor: x64

PR-URL: https://github.com/nodejs/node/pull/18052
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Rod Vagg 2018-01-09 14:48:31 +11:00 committed by Anna Henningsen
parent 95eb02dc74
commit 591a8adeae
No known key found for this signature in database
GPG Key ID: 9C63F3A6CD2AD8F9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -61,7 +61,7 @@ parser = optparse.OptionParser()
valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
'android', 'aix', 'cloudabi') 'android', 'aix', 'cloudabi')
valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc', valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'mips64el', 'ppc',
'ppc64', 'x32','x64', 'x86', 's390', 's390x') 'ppc64', 'x32','x64', 'x86', 'x86_64', 's390', 's390x')
valid_arm_float_abi = ('soft', 'softfp', 'hard') valid_arm_float_abi = ('soft', 'softfp', 'hard')
valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon') valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx') valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
@ -861,6 +861,9 @@ def configure_node(o):
# the Makefile resets this to x86 afterward # the Makefile resets this to x86 afterward
if target_arch == 'x86': if target_arch == 'x86':
target_arch = 'ia32' target_arch = 'ia32'
# x86_64 is common across linuxes, allow it as an alias for x64
if target_arch == 'x86_64':
target_arch = 'x64'
o['variables']['host_arch'] = host_arch o['variables']['host_arch'] = host_arch
o['variables']['target_arch'] = target_arch o['variables']['target_arch'] = target_arch
o['variables']['node_byteorder'] = sys.byteorder o['variables']['node_byteorder'] = sys.byteorder