Skip to content

Commit eb6f707

Browse files
authored
Revert "Patch has landed, no longer needed (#18570)" (#18574)
2 parents 5003fec + 6d2177d commit eb6f707

File tree

1 file changed

+48
-0
lines changed

1 file changed

+48
-0
lines changed
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
From 6e36330872998c791a2c0d31b688e1bdece2451f Mon Sep 17 00:00:00 2001
2+
From: Jo Shields <joshield@microsoft.com>
3+
Date: Fri, 2 Feb 2024 06:56:20 -0500
4+
Subject: [PATCH] Source built short stack support (#97725)
5+
6+
Backport: https://github.com/dotnet/runtime/pull/97725
7+
8+
--- a/eng/SourceBuild.props 2024-02-07 11:01:33.807337902 -0500
9+
+++ b/eng/SourceBuild.props 2024-02-05 16:48:58.219933758 -0500
10+
@@ -15,6 +15,7 @@
11+
<!-- Split e.g. 'fedora.33-x64' into 'fedora.33' and 'x64'. -->
12+
<_targetRidPlatformIndex>$(TargetRid.LastIndexOf('-'))</_targetRidPlatformIndex>
13+
<TargetArch>$(TargetRid.Substring($(_targetRidPlatformIndex)).TrimStart('-'))</TargetArch>
14+
+ <TargetOS>$(TargetRid.Substring(0, $(_targetRidPlatformIndex)))</TargetOS>
15+
16+
<_hostRidPlatformIndex>$(_hostRid.LastIndexOf('-'))</_hostRidPlatformIndex>
17+
<_hostArch>$(_hostRid.Substring($(_hostRidPlatformIndex)).TrimStart('-'))</_hostArch>
18+
@@ -22,6 +23,17 @@
19+
<LogVerbosity Condition="'$(LogVerbosity)' == ''">minimal</LogVerbosity>
20+
</PropertyGroup>
21+
22+
+ <PropertyGroup Label="ShortStacks">
23+
+ <ShortStack Condition="'$(TargetOS)' == 'wasi'">true</ShortStack>
24+
+ <ShortStack Condition="'$(TargetOS)' == 'browser'">true</ShortStack>
25+
+ <ShortStack Condition="'$(TargetOS)' == 'ios'">true</ShortStack>
26+
+ <ShortStack Condition="'$(TargetOS)' == 'iossimulator'">true</ShortStack>
27+
+ <ShortStack Condition="'$(TargetOS)' == 'tvos'">true</ShortStack>
28+
+ <ShortStack Condition="'$(TargetOS)' == 'tvossimulator'">true</ShortStack>
29+
+ <ShortStack Condition="'$(TargetOS)' == 'maccatalyst'">true</ShortStack>
30+
+ <ShortStack Condition="'$(TargetOS)' == 'android'">true</ShortStack>
31+
+ </PropertyGroup>
32+
+
33+
<Target Name="GetRuntimeSourceBuildCommandConfiguration"
34+
BeforeTargets="GetSourceBuildCommandConfiguration">
35+
<PropertyGroup>
36+
@@ -29,9 +41,10 @@
37+
This allows to build the repository using './build.sh <args> /p:DotNetBuildFromSource=true'.
38+
Properties that control flags from source-build, and the expected output for source-build should be added to this file. -->
39+
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)arch $(TargetArch)</InnerBuildArgs>
40+
- <InnerBuildArgs Condition=" '$(TargetArch)' != '$(_hostArch)' ">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
41+
+ <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)os $(TargetOS)</InnerBuildArgs>
42+
+ <InnerBuildArgs Condition="'$(TargetArch)' != '$(_hostArch)' and '$(ShortStack)' != 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
43+
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)configuration $(Configuration)</InnerBuildArgs>
44+
- <InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)allconfigurations</InnerBuildArgs>
45+
+ <InnerBuildArgs Condition="'$(ShortStack)' != 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)allconfigurations</InnerBuildArgs>
46+
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)verbosity $(LogVerbosity)</InnerBuildArgs>
47+
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
48+
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>

0 commit comments

Comments
 (0)