Skip to content

Commit 722344e

Browse files
authored
Prevent Arm64 CrossDac builds running on Arm64. (#88467)
* Prevent Arm64 CrossDac builds running on Arm64. Currently, when building the CLR on win-arm64, CrossDac builds for Linux with an (incorrect) host arch of x64 are attempted, failing the build. This patch prevents those builds running on systems with an identical host architecture to the cross target. * Revert to simpler strategy of simply ignoring when arch != x86|x64.
1 parent ec025ad commit 722344e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

eng/Subsets.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
<CrossDacHostArch Condition="'$(TargetArchitecture)' == 'arm'">x86</CrossDacHostArch>
278278
</PropertyGroup>
279279

280-
<ItemGroup Condition="$(_subset.Contains('+linuxdac+')) and $([MSBuild]::IsOsPlatform(Windows)) and '$(TargetArchitecture)' != 'x86'">
280+
<ItemGroup Condition="$(_subset.Contains('+linuxdac+')) and $([MSBuild]::IsOsPlatform(Windows)) and ('$(BuildArchitecture)' == 'x64' or '$(BuildArchitecture)' == 'x86') and '$(TargetArchitecture)' != 'x86'">
281281
<ProjectToBuild
282282
Include="$(CoreClrProjectRoot)runtime.proj"
283283
AdditionalProperties="%(AdditionalProperties);
@@ -289,7 +289,7 @@
289289
CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1" Category="clr" />
290290
</ItemGroup>
291291

292-
<ItemGroup Condition="$(_subset.Contains('+alpinedac+')) and $([MSBuild]::IsOsPlatform(Windows)) and '$(TargetArchitecture)' != 'x86'">
292+
<ItemGroup Condition="$(_subset.Contains('+alpinedac+')) and $([MSBuild]::IsOsPlatform(Windows)) and ('$(BuildArchitecture)' == 'x64' or '$(BuildArchitecture)' == 'x86') and '$(TargetArchitecture)' != 'x86'">
293293
<ProjectToBuild
294294
Include="$(CoreClrProjectRoot)runtime.proj"
295295
AdditionalProperties="%(AdditionalProperties);

0 commit comments

Comments
 (0)