Skip to content

Commit 1083f5d

Browse files
committed
Revert to simpler strategy of simply ignoring when arch != x86|x64.
1 parent de5df5c commit 1083f5d

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
@@ -276,7 +276,7 @@
276276
<CrossDacHostArch Condition="'$(TargetArchitecture)' == 'arm'">x86</CrossDacHostArch>
277277
</PropertyGroup>
278278

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

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

0 commit comments

Comments
 (0)