Skip to content

Commit ebaa0cd

Browse files
eiriktsarpalishez2010
andauthoredJul 11, 2024
Use ARM64 tools when building on ARM64 hosts (#104695)
* Use ARM64 tools when building on ARM64 hosts * Fix cross-compiling arm64 from x64 * Update src/coreclr/build-runtime.cmd Co-authored-by: Steve <hez2010@outlook.com> --------- Co-authored-by: Steve <hez2010@outlook.com>
1 parent 2fe4afa commit ebaa0cd

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed
 

‎eng/native/init-vs-env.cmd

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
set "__VCBuildArch="
77
if /i "%~1" == "x86" (set __VCBuildArch=x86)
88
if /i "%~1" == "x64" (set __VCBuildArch=x86_amd64)
9-
if /i "%~1" == "arm" (set __VCBuildArch=x86_arm)
10-
if /i "%~1" == "arm64" (set __VCBuildArch=x86_arm64)
11-
if /i "%~1" == "wasm" (if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (set __VCBuildArch=x86_arm64) else (set __VCBuildArch=x86_amd64))
9+
if /i "%~1" == "arm64" (if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (set __VCBuildArch=arm64) else (set __VCBuildArch=x86_arm64))
10+
if /i "%~1" == "wasm" (if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (set __VCBuildArch=arm64) else (set __VCBuildArch=x86_amd64))
1211

1312
:: Default to highest Visual Studio version available that has Visual C++ tools.
1413
::

‎src/coreclr/build-runtime.cmd

+1-4
Original file line numberDiff line numberDiff line change
@@ -363,11 +363,8 @@ if %__BuildNative% EQU 1 (
363363
REM Set the environment for the native build
364364
set __VCTargetArch=amd64
365365
if /i "%__HostArch%" == "x86" ( set __VCTargetArch=x86 )
366-
if /i "%__HostArch%" == "arm" (
367-
set __VCTargetArch=x86_arm
368-
)
369366
if /i "%__HostArch%" == "arm64" (
370-
set __VCTargetArch=x86_arm64
367+
if /i "%__ProcessorArch%" == "ARM64" (set __VCTargetArch=arm64) else (set __VCTargetArch=x86_arm64)
371368
)
372369

373370
if NOT DEFINED SkipVCEnvInit (

0 commit comments

Comments
 (0)