Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for short stack builds. #18463

Merged
merged 18 commits into from
Feb 7, 2024
Merged

Support for short stack builds. #18463

merged 18 commits into from
Feb 7, 2024

Conversation

directhex
Copy link
Member

Tested with android-x64 and android-amd64 on Linux x64, and iossimulator-x64 on macOS ARM64.

Depends on dotnet/runtime#97725

Tested with android-x64 and android-amd64 on Linux x64, and iossimulator-x64
on macOS ARM64.

Depends on dotnet/runtime#97725
@directhex directhex requested a review from a team as a code owner January 30, 2024 22:36
@@ -6,6 +6,18 @@
<DotNetBuildOrchestrator>true</DotNetBuildOrchestrator>
</PropertyGroup>

<PropertyGroup Label="ShortStacks">
<_OverrideTargetOS>$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.LastIndexOf('-'))))</_OverrideTargetOS>
<ShortStack Condition="'$(_OverrideTargetOS)' == 'wasi'">true</ShortStack>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if the property name should indicate that this is a "runtime short stack" build.

@directhex
Copy link
Member Author

Tested for android-arm64. iossimulator-x64 was working until I updated Xcode (seems Apple changed the linker and there are unrelated problems with the new one). wasi-wasm is building the runtime package, but throwing a couple of odd errors that need resolving.

@ViktorHofer
Copy link
Member

Let's hold this until #18409 is in.

@directhex
Copy link
Member Author

Agreed, am going to try and fix wasi & musl in the interim

@directhex
Copy link
Member Author

wasi-wasm is fixed by dotnet/runtime#98004

Copy link
Member

@ViktorHofer ViktorHofer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Requesting changes as it looks like the TargetRid would be wrong whenever we start doing a Windows short stack build. Not a problem today but it's incorrect.

@directhex directhex merged commit debb6bf into dotnet:main Feb 7, 2024
19 checks passed
@ViktorHofer
Copy link
Member

ViktorHofer commented Feb 12, 2024

I think this regressed some of the full source-build legs: dotnet/source-build#4111. While this PR triggered a full build, it only did so for the UB legs, not for source-build:

image

nit: Please use squash merge unless you really want all the individual commits to show up in history.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants