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] Don't link Swift/CryptoKit on iOS-like platforms #87216

Merged
merged 2 commits into from
Jun 8, 2023
Merged

[NativeAOT] Don't link Swift/CryptoKit on iOS-like platforms #87216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13082d1
Don't link Swift/CryptoKit on iOS-like platforms
filipnavara Jun 7, 2023
f806b53
Update Microsoft.NETCore.Native.Unix.targets
filipnavara Jun 7, 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
8 changes: 4 additions & 4 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ The .NET Foundation licenses this file to you under the MIT license.

<ItemGroup Condition="'$(_IsApplePlatform)' == 'true'">
<NativeFramework Include="CoreFoundation" />
<NativeFramework Include="CryptoKit" />
<NativeFramework Condition="'$(_targetOS)' == 'osx'" Include="CryptoKit" />
<NativeFramework Include="Foundation" />
<NativeFramework Include="Security" />
<!-- The library builds don't reference the GSS API on tvOS builds. -->
Expand All @@ -119,12 +119,12 @@ The .NET Foundation licenses this file to you under the MIT license.
<LinkerArg Include="-lstdc++" Condition="'$(LinkStandardCPlusPlusLibrary)' == 'true'" />
<LinkerArg Include="-ldl" />
<LinkerArg Include="-lobjc" Condition="'$(_IsApplePlatform)' == 'true'" />
<LinkerArg Include="-lswiftCore" Condition="'$(_IsApplePlatform)' == 'true'" />
<LinkerArg Include="-lswiftFoundation" Condition="'$(_IsApplePlatform)' == 'true'" />
<LinkerArg Include="-lswiftCore" Condition="'$(_targetOS)' == 'osx'" />
<LinkerArg Include="-lswiftFoundation" Condition="'$(_targetOS)' == 'osx'" />
filipnavara marked this conversation as resolved.
Show resolved Hide resolved
<LinkerArg Include="-lz" />
<LinkerArg Include="-lrt" Condition="'$(_IsApplePlatform)' != 'true'" />
<LinkerArg Include="-licucore" Condition="'$(_IsApplePlatform)' == 'true'" />
<LinkerArg Include="-L/usr/lib/swift" Condition="'$(_IsApplePlatform)' == 'true'" />
<LinkerArg Include="-L/usr/lib/swift" Condition="'$(_targetOS)' == 'osx'" />
<LinkerArg Include="@(StaticICULibs)" Condition="'$(StaticICULinking)' == 'true'" />
<LinkerArg Include="@(StaticSslLibs)" Condition="'$(StaticOpenSslLinking)' == 'true'" />
<LinkerArg Include="-lm" />
Expand Down