From d78dbaca86868da29b5bf02bdcf95359cc7cb5db Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 30 Jan 2024 17:35:07 -0500 Subject: [PATCH] Support for short stack builds. Tested with android-x64 and android-amd64 on Linux x64, and iossimulator-x64 on macOS ARM64. Depends on https://github.com/dotnet/runtime/pull/97725 --- src/SourceBuild/content/Directory.Build.props | 14 +++++++++++++- src/SourceBuild/content/repo-projects/dotnet.proj | 4 ++++ src/SourceBuild/content/repo-projects/runtime.proj | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 2f80065a8..c63965543 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -6,6 +6,18 @@ true + + <_OverrideTargetOS>$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.LastIndexOf('-')))) + true + true + true + true + true + true + true + true + + linux osx @@ -33,7 +45,7 @@ s390x ppc64le - $(OverrideTargetRid.Substring($(OverrideTargetRid.LastIndexOf('-'))).TrimStart('-')) + $(OverrideTargetRid.Substring($(OverrideTargetRid.LastIndexOf('-'))).TrimStart('-')) x64 $(TargetArchitecture) diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index 0de74d679..5de28398c 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -24,6 +24,10 @@ + + + + diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index 50754cee4..9409f1729 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -20,8 +20,8 @@ $(BuildArgs) $(FlagParameterPrefix)arch $(OverrideTargetArch) $(BuildArgs) $(FlagParameterPrefix)os $(OverrideTargetOS) $(BuildArgs) /p:TargetRid=$(OverrideTargetRid) - $(BuildArgs) /p:RuntimeOS=$(RuntimeOS) - $(BuildArgs) /p:BaseOS=$(BaseOS) + $(BuildArgs) /p:RuntimeOS=$(RuntimeOS) + $(BuildArgs) /p:BaseOS=$(BaseOS)