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

[NativeAOT] Enable dynamic linking of ucrt for release runtime #71182

Merged
merged 2 commits into from
Jun 23, 2022
Merged

[NativeAOT] Enable dynamic linking of ucrt for release runtime #71182

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
05a5792
[NativeAOT] Enable dynamic linking of ucrt for release runtime
jkotas Jun 23, 2022
a1918c5
Update src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
jkotas Jun 23, 2022
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
5 changes: 5 additions & 0 deletions src/coreclr/nativeaot/BuildIntegration/BuildIntegration.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@

<Target Name="Build">
<Copy SourceFiles="@(Content)" DestinationFolder="$(OutputPath)" />

<!-- Create breadcrumb to disable dynamic linking of release crt for debug runtime -->
<WriteLinesToFile
File="$(RuntimeBinDir)/aotsdk/debugucrt.txt"
AaronRobinsonMSFT marked this conversation as resolved.
Show resolved Hide resolved
Condition="'$(TargetsWindows)'=='true' and '$(Configuration)' != 'Release'" />
</Target>

<Target Name="Restore" />
Expand Down
6 changes: 6 additions & 0 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ The .NET Foundation licenses this file to you under the MIT license.
<LinkerArg Condition="'$(ControlFlowGuard)' == 'Guard'" Include="/guard:cf" />
</ItemGroup>

<ItemGroup Condition="!Exists('$(IlcSdkPath)debugucrt.txt')">
AaronRobinsonMSFT marked this conversation as resolved.
Show resolved Hide resolved
<!-- Force ucrt to be dynamically linked for release runtime -->
jkotas marked this conversation as resolved.
Show resolved Hide resolved
<LinkerArg Include="/NODEFAULTLIB:libucrt.lib" />
<LinkerArg Include="/DEFAULTLIB:ucrt.lib" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' != 'Debug'">
<LinkerArg Include="/OPT:REF" />
<LinkerArg Include="/OPT:ICF" />
Expand Down