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.

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

Set UseNativeAotForComponents to false on bionic #103454

Merged
merged 3 commits into from
Jun 14, 2024
Merged

Set UseNativeAotForComponents to false on bionic #103454

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86a650d
Set UseNativeAotForComponents to false on bionic
MichalStrehovsky Jun 13, 2024
7d101eb
Update compile-native.proj
MichalStrehovsky Jun 14, 2024
a46e5c6
Update Subsets.props
MichalStrehovsky Jun 14, 2024
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
3 changes: 3 additions & 0 deletions src/native/managed/compile-native.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<SysRoot Condition="'$(CrossBuild)' == 'true' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
<LinkerFlavor Condition="'$(CrossBuild)' == 'true' and '$(TargetsLinux)' == 'true'">lld</LinkerFlavor>
<CustomLinkerArgToolchainArg Condition="'$(CrossBuild)' == 'true' and '$(HostArchitecture)' == '$(TargetArchitecture)' and '$(HostOS)' != 'windows'">--gcc-toolchain=$(ROOTFS_DIR)/usr</CustomLinkerArgToolchainArg>

<!-- disable on linux-bionic, for now -->
<UseNativeAotForComponents Condition="'$(TargetsLinuxBionic)' == 'true'">false</UseNativeAotForComponents>
Copy link
Member

@am11 am11 Jun 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Please move it next to

runtime/eng/Subsets.props

Line 125 in 5508f79

<UseNativeAotForComponents Condition="'$(NativeAotSupported)' == 'true' and '$(TargetOS)' == '$(HostOS)' and ('$(TargetOS)' != 'windows' or '$(TargetArchitecture)' != 'x86')">true</UseNativeAotForComponents>

The whole point was to control it centrally.

Copy link
Member Author

Choose a reason for hiding this comment

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

It's a local workaround for a problem in this project file, as opposed to global statement.

Publishing for bionic is supposed to be supported for components but this project needs to configure it, like it's doing in the lines above for other crossbuilds (at minimum, set PublishAotUsingRuntimePack). I could have tried to fix it but official builds are failing and it was blocked before #103273 so I don't feel bad just blocking it "for now".

I'll move it so it doesn't conflict with #103375 but it will be in the wrong spot now given the state of main and I haven't made my mind if it will be in wrong spot after that PR still (the workaround is too detached from where the problem is).

</PropertyGroup>

<ItemGroup>
Expand Down
Loading