diff options
| author | Rod Vagg <rod@vagg.org> | 2015-06-10 17:05:26 +1000 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2015-06-25 15:22:27 +1000 |
| commit | dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc (patch) | |
| tree | 4c449f742eee5542f73ddd02c191e50c8167f6b8 /configure | |
| parent | 8e9089ac3574682bac610b4b7a93a7915ad5ab8d (diff) | |
| download | node-new-dcbb9e1da65ac16e8ed783d0b2b82ad6c7de8dbc.tar.gz | |
build: update build targets for io.js
PR-URL: https://github.com/nodejs/io.js/pull/1938
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -26,7 +26,7 @@ import nodedownload parser = optparse.OptionParser() valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', 'android') -valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'x32', 'x64') +valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'x32', 'x64', 'x86') valid_arm_float_abi = ('soft', 'softfp', 'hard') valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx') valid_mips_fpu = ('fp32', 'fp64', 'fpxx') @@ -607,6 +607,10 @@ def configure_node(o): host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc() target_arch = options.dest_cpu or host_arch + # ia32 is preferred by the build tools (GYP) over x86 even if we prefer the latter + # the Makefile resets this to x86 afterward + if target_arch == 'x86': + target_arch = 'ia32' o['variables']['host_arch'] = host_arch o['variables']['target_arch'] = target_arch |