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

Fix winarm64 crossdac build #112594

Merged
merged 5 commits into from
Feb 20, 2025
+13 −5
Merged

Fix winarm64 crossdac build #112594

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30a8a64
Fix win-arm64 crossdac build
steveisok Feb 14, 2025
1104e49
Delay expand variable
steveisok Feb 15, 2025
26b1e40
Merge remote-tracking branch 'upstream/main' into fix-winarm64-crossd…
steveisok Feb 20, 2025
1db7ce4
Feedback and fixes
steveisok Feb 20, 2025
42c8806
More feedback
steveisok Feb 20, 2025
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
10 changes: 9 additions & 1 deletion src/coreclr/build-runtime.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ set __Ninja=1
set __RequestedBuildComponents=
set __OutputRid=
set __SubDir=
set __ShouldEmitCmakeTarget=0

:Arg_Loop
if "%1" == "" goto ArgsDone
Expand Down Expand Up @@ -392,12 +393,19 @@ if %__BuildNative% EQU 1 (
set __ExtraCmakeArgs="-DCMAKE_BUILD_TYPE=!__BuildType!"
)

:: We want to specify CMAKE_TARGET_* when __HostOS isn't passed in or is windows (host == target)
if /i not "%__HostOS%" == "%__TargetOS%" (
if /i "%__HostOS%" == "" (
set __ExtraCmakeArgs=!__ExtraCmakeArgs! "-DCLR_CMAKE_TARGET_ARCH=%__TargetArch%" "-DCLR_CMAKE_TARGET_OS=%__TargetOS%"
set __ShouldEmitCmakeTarget=1
)
) else (
set __ShouldEmitCmakeTarget=1
)

if !__ShouldEmitCmakeTarget! EQU 1 (
set __ExtraCmakeArgs=!__ExtraCmakeArgs! "-DCLR_CMAKE_TARGET_ARCH=%__TargetArch%" "-DCLR_CMAKE_TARGET_OS=%__TargetOS%"
)

set __ExtraCmakeArgs=!__ExtraCmakeArgs! "-DCLI_CMAKE_FALLBACK_OS=%__HostFallbackOS%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_PATH=%__PgoOptDataPath%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%"

if /i "%__TargetOS%" == "android" (
Expand Down