Skip to content

Don't consider linux-bionic as a cross-build in UB builds #48549

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 17, 2025
Merged

Don't consider linux-bionic as a cross-build in UB builds #48549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/SourceBuild/patches/runtime/0003-dont-consider-linux-bionic-cross-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 1bc1910ad1a68cac8fc71eb48fa4dfb5e56ca775 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <[email protected]>
Date: Thu, 17 Apr 2025 09:22:28 -0700
Subject: [PATCH] Don't consider linux-bionic as a cross-build in UB builds

Backport: https://github.com/dotnet/runtime/pull/114787
---
eng/DotNetBuild.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index 1e3137ec241e4f..86afe915029d8a 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -34,7 +34,7 @@
<InnerBuildArgs Condition="'$(_portableOS)' == 'win'">$(InnerBuildArgs) $(FlagParameterPrefix)os windows</InnerBuildArgs>
<InnerBuildArgs Condition="'$(_portableOS)' != 'win'">$(InnerBuildArgs) $(FlagParameterPrefix)os $(_portableOS)</InnerBuildArgs>
<!-- Mobile builds are never "cross" builds as they don't have a rootfs-based filesystem build. -->
- <InnerBuildArgs Condition="'$(CrossBuild)' == 'true' or ('$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(TargetsMobile)' != 'true')">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
+ <InnerBuildArgs Condition="'$(CrossBuild)' == 'true' or ('$(TargetArchitecture)' != '$(BuildArchitecture)' and '$(TargetsMobile)' != 'true' and '$(_portableOS)' != 'linux-bionic')">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)configuration $(Configuration)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)verbosity $(LogVerbosity)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
Loading