diff options
| author | Marek Safar <marek.safar@gmail.com> | 2022-05-02 11:19:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 11:19:33 +0300 |
| commit | 85d2aff4da96ac01babd461a1c76c358d4979d68 (patch) | |
| tree | f971abe5d27174a882dda9a2088d6cbe9fbf9689 /Directory.Build.props | |
| parent | bc1cffa6312338dbc8ce794b9dbc15f961b59575 (diff) | |
| parent | 8823eefe91f6b774961c32800dea977b687d7328 (diff) | |
Merge branch 'main' into darc-main-31d4c308-6782-4440-8589-61f58f239059
Diffstat (limited to 'Directory.Build.props')
| -rw-r--r-- | Directory.Build.props | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index 2e6a7b6c0f5..acee2f3fe18 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -161,7 +161,8 @@ <_runtimeOS Condition="$(_runtimeOS.StartsWith('tizen'))">linux</_runtimeOS> <_runtimeOS Condition="'$(PortableBuild)' == 'true'">$(_portableOS)</_runtimeOS> - <_packageOS Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)</_packageOS> + <_packageLibc Condition="$(_runtimeOS.Contains('musl'))">-musl</_packageLibc> + <_packageOS Condition="'$(CrossBuild)' == 'true'">$(_hostOS.ToLowerInvariant)$(_packageLibc)</_packageOS> <_packageOS Condition="'$(_packageOS)' == '' and '$(PortableBuild)' == 'true'">$(_portableOS)</_packageOS> <_packageOS Condition="'$(_packageOS)' == ''">$(_runtimeOS)</_packageOS> </PropertyGroup> @@ -191,10 +192,6 @@ <PackageRID>$(_packageOS)-$(TargetArchitecture)</PackageRID> - <!-- Crossgen2 does not support armel, so we will use arm instead. --> - <Crossgen2PackageRID Condition="'$(TargetArchitecture)' == 'armel'">$(_packageOS)-arm</Crossgen2PackageRID> - <Crossgen2PackageRID Condition="'$(TargetArchitecture)' != 'armel'">$(PackageRID)</Crossgen2PackageRID> - <OutputRid Condition="'$(OutputRid)' == ''">$(PackageRID)</OutputRid> <OutputRid Condition="'$(PortableBuild)' == 'true'">$(_portableOS)-$(TargetArchitecture)</OutputRid> </PropertyGroup> |