Skip to content

Commit 9e5c575

Browse files
rvaggMylesBorins
authored andcommitted
build: allow x86_64 as a dest_cpu alias for x64
x86_64 is a standard arch descriptor on Linux, allow it as an alias for our preferred descriptor: x64 PR-URL: #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>
1 parent 7a05cd3 commit 9e5c575

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

configure

+4-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ parser = optparse.OptionParser()
4747
valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux',
4848
'android', 'aix')
4949
valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'ppc', 'ppc64', 'x32',
50-
'x64', 'x86', 's390', 's390x')
50+
'x64', 'x86', 'x86_64', 's390', 's390x')
5151
valid_arm_float_abi = ('soft', 'softfp', 'hard')
5252
valid_arm_fpu = ('vfp', 'vfpv3', 'vfpv3-d16', 'neon')
5353
valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
@@ -747,6 +747,9 @@ def configure_node(o):
747747
# the Makefile resets this to x86 afterward
748748
if target_arch == 'x86':
749749
target_arch = 'ia32'
750+
# x86_64 is common across linuxes, allow it as an alias for x64
751+
if target_arch == 'x86_64':
752+
target_arch = 'x64'
750753
o['variables']['host_arch'] = host_arch
751754
o['variables']['target_arch'] = target_arch
752755
o['variables']['node_byteorder'] = sys.byteorder

0 commit comments

Comments
 (0)