Skip to content

Commit 693e2f3

Browse files
Fix source-build on the s390x platform (#58618)
* Do not disable Mono in source-build if it is the primary runtime Co-authored-by: Ulrich Weigand <[email protected]>
1 parent 41dcbd6 commit 693e2f3

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

eng/Subsets.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,19 @@
2222
that indicates tests should be run. Otherwise, they'll only be built.)
2323
-->
2424

25+
<!-- Determine the primary runtime flavor. This is usually CoreCLR, except on
26+
platforms (like s390x) where only Mono is supported. The primary runtime
27+
flavor is used to decide when to build the hosts and installers. -->
28+
<PropertyGroup>
29+
<PrimaryRuntimeFlavor>CoreCLR</PrimaryRuntimeFlavor>
30+
<PrimaryRuntimeFlavor Condition="'$(TargetArchitecture)' == 's390x'">Mono</PrimaryRuntimeFlavor>
31+
</PropertyGroup>
32+
2533
<PropertyGroup>
2634
<DefaultSubsets>clr+mono+libs+host+packs</DefaultSubsets>
2735
<DefaultSubsets Condition="'$(TargetsMobile)' == 'true'">mono+libs+packs</DefaultSubsets>
28-
<!-- mono is not supported in source build. On Windows mono is supported for x86/x64 only. -->
29-
<DefaultSubsets Condition="'$(DotNetBuildFromSource)' == 'true' or ('$(TargetOS)' == 'windows' and '$(TargetArchitecture)' != 'x86' and '$(TargetArchitecture)' != 'x64')">clr+libs+host+packs</DefaultSubsets>
36+
<!-- In source build, mono is only supported as primary runtime flavor. On Windows mono is supported for x86/x64 only. -->
37+
<DefaultSubsets Condition="('$(DotNetBuildFromSource)' == 'true' and '$(PrimaryRuntimeFlavor)' != 'Mono') or ('$(TargetOS)' == 'windows' and '$(TargetArchitecture)' != 'x86' and '$(TargetArchitecture)' != 'x64')">clr+libs+host+packs</DefaultSubsets>
3038
</PropertyGroup>
3139

3240
<!-- Init _subset here in to allow RuntimeFlavor to be set as early as possible -->
@@ -35,14 +43,6 @@
3543
<_subset Condition="'$(Subset)' == ''">+$(DefaultSubsets)+</_subset>
3644
</PropertyGroup>
3745

38-
<!-- Determine the primary runtime flavor. This is usually CoreCLR, except on
39-
platforms (like s390x) where only Mono is supported. The primary runtime
40-
flavor is used to decide when to build the hosts and installers. -->
41-
<PropertyGroup>
42-
<PrimaryRuntimeFlavor>CoreCLR</PrimaryRuntimeFlavor>
43-
<PrimaryRuntimeFlavor Condition="'$(TargetArchitecture)' == 's390x'">Mono</PrimaryRuntimeFlavor>
44-
</PropertyGroup>
45-
4646
<PropertyGroup>
4747
<RuntimeFlavor Condition="'$(TargetsMobile)' == 'true'">Mono</RuntimeFlavor>
4848
<RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and ($(_subset.Contains('+mono+')) or $(_subset.Contains('+mono.runtime+'))) and (!$(_subset.Contains('+clr+')) and !$(_subset.Contains('+clr.runtime+')))">Mono</RuntimeFlavor>

0 commit comments

Comments
 (0)