Skip to content

Fix the issue of Mono.AotCross build errors #117971

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 2 commits into from
Aug 18, 2025
Merged

Fix the issue of Mono.AotCross build errors #117971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9be6f4
Fix the issue of Mono.AotCross build errors
Linlccc Jul 23, 2025
05af316
Fix the issue of Mono.AotCross build errors
Linlccc Jul 23, 2025
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
2 changes: 1 addition & 1 deletion eng/Subsets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<BootstrapSubsets Condition="'$(UseNativeAotForComponents)' == 'true'">$(BootstrapSubsets)+clr.nativeaotlibs+clr.nativeaotruntime+libs.native</BootstrapSubsets>

<SwapNativeForIL Condition="$(_subset.Contains('+bootstrap+')) and '$(RuntimeFlavor)' == 'CoreCLR'">true</SwapNativeForIL>

<!-- Define AllSubsets to include all available subsets including OnDemand ones -->
<AllSubsetsExpansion>clr.nativeprereqs+clr.iltools+clr.runtime+clr.native+clr.aot+clr.nativeaotlibs+clr.nativeaotruntime+clr.crossarchtools</AllSubsetsExpansion>
<AllSubsetsExpansion>$(AllSubsetsExpansion)+clr.paltests+clr.paltestlist+clr.hosts+clr.jit+clr.alljits+clr.alljitscommunity+clr.spmi+clr.corelib+clr.nativecorelib+clr.tools+clr.toolstests+clr.packages</AllSubsetsExpansion>
Expand Down
9 changes: 9 additions & 0 deletions src/mono/monoaotcross.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@
<MonoAotTargetRids Include="$(MonoAotTargets.Split(';'))" />
</ItemGroup>

<Target Name="CheckMonoAotTargets" BeforeTargets="BuildMonoCrossAllTargets">
<PropertyGroup>
<_SupportOS>android, browser, wasi</_SupportOS>
<_SupportOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(_SupportOS), tvos, ios, maccatalyst</_SupportOS>
</PropertyGroup>

<Error Condition="'@(MonoAotTargetRids->Count())' == '0'" Text="MonoAotTargets is empty. Please configure MonoCrossAOTTargetOS with supported values: $(_SupportOS). Multiple values should be separated with '+' (e.g., /p:MonoCrossAOTTargetOS=android+browser)." />
</Target>

<Target Name="BuildMonoCrossAllTargets" AfterTargets="Build">
<MSBuild Targets="Restore"
Projects="$(MSBuildThisFileDirectory)mono.proj"
Expand Down
Loading