diff options
author | Niyas Sait <niyas.sait@linaro.org> | 2022-04-05 11:19:18 +0000 |
---|---|---|
committer | Juan José Arboleda <soyjuanarbol@gmail.com> | 2022-04-06 12:25:55 -0500 |
commit | 1f7d2e800cc8c99618313d8bce0912c47aa0e770 (patch) | |
tree | 45533158f6de3483f1bec0d11bafdfe5f7c9e7a7 | |
parent | 7766bf954f8d34b7e89ce4be619924580f72792d (diff) | |
download | node-new-1f7d2e800cc8c99618313d8bce0912c47aa0e770.tar.gz |
build: windows/arm64 native compilation support
Added support for detecting ARM64 host architecture for windows and
avoid explicit cross-compilation flag for win/arm64 target as
configure.py can auto-detect configuration from host and
target architecture.
Refs: https://github.com/nodejs/build/issues/2540
PR-URL: https://github.com/nodejs/node/pull/42408
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
-rwxr-xr-x | configure.py | 1 | ||||
-rw-r--r-- | vcbuild.bat | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/configure.py b/configure.py index b67945e028..f24f1b5b56 100755 --- a/configure.py +++ b/configure.py @@ -1121,6 +1121,7 @@ def host_arch_win(): 'x86' : 'ia32', 'arm' : 'arm', 'mips' : 'mips', + 'ARM64' : 'arm64' } return matchup.get(arch, 'ia32') diff --git a/vcbuild.bat b/vcbuild.bat index d1a9e59255..e486b83b6e 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -198,7 +198,6 @@ if defined target_arch set configure_flags=%configure_flags% --dest-cpu=%ta if defined openssl_no_asm set configure_flags=%configure_flags% --openssl-no-asm if defined DEBUG_HELPER set configure_flags=%configure_flags% --verbose if "%target_arch%"=="x86" if "%PROCESSOR_ARCHITECTURE%"=="AMD64" set configure_flags=%configure_flags% --no-cross-compiling -if "%target_arch%"=="arm64" set configure_flags=%configure_flags% --cross-compiling if not exist "%~dp0deps\icu" goto no-depsicu if "%target%"=="Clean" echo deleting %~dp0deps\icu |