Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ARM64 tools when building on ARM64 hosts #104695

Merged
merged 3 commits into from
Jul 11, 2024
Merged

Use ARM64 tools when building on ARM64 hosts #104695

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c1ce6a
Use ARM64 tools when building on ARM64 hosts
eiriktsarpalis Jul 10, 2024
8804871
Fix cross-compiling arm64 from x64
eiriktsarpalis Jul 10, 2024
5814875
Update src/coreclr/build-runtime.cmd
eiriktsarpalis Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions eng/native/init-vs-env.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
set "__VCBuildArch="
if /i "%~1" == "x86" (set __VCBuildArch=x86)
if /i "%~1" == "x64" (set __VCBuildArch=x86_amd64)
eiriktsarpalis marked this conversation as resolved.
Show resolved Hide resolved
eiriktsarpalis marked this conversation as resolved.
Show resolved Hide resolved
if /i "%~1" == "arm" (set __VCBuildArch=x86_arm)
if /i "%~1" == "arm64" (set __VCBuildArch=x86_arm64)
if /i "%~1" == "wasm" (if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (set __VCBuildArch=x86_arm64) else (set __VCBuildArch=x86_amd64))
if /i "%~1" == "arm64" (if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (set __VCBuildArch=arm64) else (set __VCBuildArch=x86_arm64))
if /i "%~1" == "wasm" (if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (set __VCBuildArch=arm64) else (set __VCBuildArch=x86_amd64))
eiriktsarpalis marked this conversation as resolved.
Show resolved Hide resolved

:: Default to highest Visual Studio version available that has Visual C++ tools.
::
Expand Down
5 changes: 1 addition & 4 deletions src/coreclr/build-runtime.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,11 +363,8 @@ if %__BuildNative% EQU 1 (
REM Set the environment for the native build
set __VCTargetArch=amd64
if /i "%__HostArch%" == "x86" ( set __VCTargetArch=x86 )
if /i "%__HostArch%" == "arm" (
set __VCTargetArch=x86_arm
)
if /i "%__HostArch%" == "arm64" (
set __VCTargetArch=x86_arm64
if /i "%__ProcessorArch%" == arm64 (set __VCTargetArch=arm64) else (set __VCTargetArch=x86_arm64)
eiriktsarpalis marked this conversation as resolved.
Show resolved Hide resolved
)

if NOT DEFINED SkipVCEnvInit (
Expand Down
Loading