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

build: windows/arm64 native compilation support

Browse Source 
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>
This commit is contained in:
Niyas Sait 2022-04-05 11:19:18 +00:00 committed by GitHub
parent d58f4081b5
commit 9b3aad1cdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.py
View File

@ -1122,6 +1122,7 @@ def host_arch_win():
'x86' : 'ia32', 'x86' : 'ia32',
'arm' : 'arm', 'arm' : 'arm',
'mips' : 'mips', 'mips' : 'mips',
'ARM64' : 'arm64'
} }
return matchup.get(arch, 'ia32') return matchup.get(arch, 'ia32')

1
vcbuild.bat
View File

@ -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 openssl_no_asm set configure_flags=%configure_flags% --openssl-no-asm
if defined DEBUG_HELPER set configure_flags=%configure_flags% --verbose 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%"=="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 not exist "%~dp0deps\icu" goto no-depsicu
if "%target%"=="Clean" echo deleting %~dp0deps\icu if "%target%"=="Clean" echo deleting %~dp0deps\icu