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

Jump to bottom

Switch to selfhosted NativeAOT compiler #81205

Merged
merged 8 commits into from
Mar 9, 2023
Merged

Switch to selfhosted NativeAOT compiler #81205

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6d54c19
Switch to selfhosted NativeAOT compiler
MichalStrehovsky Jan 26, 2023
d051626
We need R2R sometimes
MichalStrehovsky Jan 30, 2023
3ed990c
Update ILCompiler.csproj
MichalStrehovsky Jan 30, 2023
b07c648
try fixing freebsd
MichalStrehovsky Feb 24, 2023
7265116
Merge branch 'main' into selfhostilc
MichalStrehovsky Mar 7, 2023
6e34224
Update ILCompiler.csproj
MichalStrehovsky Mar 7, 2023
5bbc2b7
Update ILCompiler.csproj
MichalStrehovsky Mar 7, 2023
3911bb1
Apply suggestions from code review
MichalStrehovsky Mar 9, 2023
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
10 changes: 6 additions & 4 deletions src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
<!-- BEGIN: Workaround for https://github.com/dotnet/runtime/issues/67742 -->
<PropertyGroup Condition="'$(BuildingInsideVisualStudio)' != 'true'">
<PublishDir>$(RuntimeBinDir)ilc-published/</PublishDir>
<PublishTrimmed>true</PublishTrimmed>
<!-- Don't R2R on ARM64 machines because ARM64 crossgen2 that comes with .NET SDK <= 7.0 Preview 7 crashes.-->
<PublishReadyToRun Condition="'$(BuildArchitecture)' != 'arm64'">true</PublishReadyToRun>
<PublishSingleFile>true</PublishSingleFile>
<NativeAotSupported Condition="'$(TargetOS)' != 'windows' and '$(TargetOS)' != 'linux' and '$(TargetOS)' != 'osx'">false</NativeAotSupported>
<NativeAotSupported Condition="'$(TargetArchitecture)' != 'x64'">false</NativeAotSupported>
<PublishAot Condition="'$(NativeAotSupported)' == 'true'">true</PublishAot>
<PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
Copy link
Member

Choose a reason for hiding this comment

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

Consider moving this to a separate ItemGroup with a top-level NativeAOTSupported condition.

Copy link
Member Author

Choose a reason for hiding this comment

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

This is already in a conditioned itemgroup so I would need to repeat the condition. Given this is eventually going away in favor of a live build, maybe it's fine.

<PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
MichalStrehovsky marked this conversation as resolved.
Show resolved Hide resolved
<PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
</PropertyGroup>

<Target Name="PublishCompiler"
Expand Down