Skip to content

Handle 'lib' variants in ModuleNameVariations to generate DirectPInvokes #118285

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
jtschuster merged 8 commits into from
Aug 5, 2025
Merged

Handle 'lib' variants in ModuleNameVariations to generate DirectPInvokes #118285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
472430b
Handle 'lib' variants in ilc ModuleNameVariations for DirectPInvokes
jtschuster Aug 1, 2025
0cdc8a8
Update src/coreclr/tools/aot/ILCompiler/ConfigurablePInvokePolicy.cs
jtschuster Aug 1, 2025
a4db9cd
Share DirectPInvoke ItemGroup for NativeAOT
jtschuster Aug 1, 2025
a75bc58
Merge branch 'DirectPInvokeLib' of https://github.com/jtschuster/runt…
jtschuster Aug 1, 2025
35a119e
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
jtschuster Aug 1, 2025
e232cc9
Use const string for "lib" literal
jtschuster Aug 1, 2025
6565bba
DirectPInvoke still needs to be set in SetupOSSpecificProps target, n…
jtschuster Aug 4, 2025
192e3b5
Remove 'lib' from other DirectPInvokes
jtschuster Aug 5, 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
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 @@ -148,8 +148,8 @@ The .NET Foundation licenses this file to you under the MIT license.
</ItemGroup>

<ItemGroup>
<DirectPInvoke Include="@(NetCoreAppNativeLibrary->'lib%(Identity)')" />
<NetCoreAppNativeLibrary Include="@(NetCoreAppNativeLibrary->'%(Identity)')">
<DirectPInvoke Include="@(NetCoreAppNativeLibrary)" />
<NetCoreAppNativeLibrary Include="@(NetCoreAppNativeLibrary)">
<EscapedPath>$(IlcFrameworkNativePath)lib%(Identity).a</EscapedPath>
</NetCoreAppNativeLibrary>
<NativeLibrary Include="@(NetCoreAppNativeLibrary->'%(EscapedPath)')" />
Expand Down Expand Up @@ -180,7 +180,7 @@ The .NET Foundation licenses this file to you under the MIT license.

<ItemGroup Condition="'$(StaticICULinking)' == 'true' and '$(NativeLib)' != 'Static' and '$(InvariantGlobalization)' != 'true'">
<NativeLibrary Include="$(IntermediateOutputPath)libs/System.Globalization.Native/build/libSystem.Globalization.Native.a" />
<DirectPInvoke Include="libSystem.Globalization.Native" />
<DirectPInvoke Include="System.Globalization.Native" />
<StaticICULibs Include="-Wl,-Bstatic" Condition="'$(StaticExecutable)' != 'true'" />
<StaticICULibs Include="-licuio -licutu -licui18n -licuuc -licudata -lstdc++" />
<StaticICULibs Include="-Wl,-Bdynamic" Condition="'$(StaticExecutable)' != 'true'" />
Expand All @@ -193,7 +193,7 @@ The .NET Foundation licenses this file to you under the MIT license.

<ItemGroup Condition="'$(StaticOpenSslLinking)' == 'true' and '$(NativeLib)' != 'Static'">
<NativeLibrary Include="$(IntermediateOutputPath)libs/System.Security.Cryptography.Native/build/libSystem.Security.Cryptography.Native.OpenSsl.a" />
<DirectPInvoke Include="libSystem.Security.Cryptography.Native.OpenSsl" />
<DirectPInvoke Include="System.Security.Cryptography.Native.OpenSsl" />
<StaticSslLibs Include="-Wl,-Bstatic" Condition="'$(StaticExecutable)' != 'true'" />
<StaticSslLibs Include="-lssl -lcrypto" />
<StaticSslLibs Include="-Wl,-Bdynamic" Condition="'$(StaticExecutable)' != 'true'" />
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The .NET Foundation licenses this file to you under the MIT license.
</ItemGroup>

<ItemGroup>
<DirectPInvoke Include="@(NetCoreAppNativeLibrary->'%(Identity)')" />
<DirectPInvoke Include="@(NetCoreAppNativeLibrary)" />
<NetCoreAppNativeLibrary Include="@(NetCoreAppNativeLibrary->'%(Identity)')">
<EscapedPath>$(IlcSdkPath)%(Identity).Aot$(LibrarySuffix)</EscapedPath>
</NetCoreAppNativeLibrary>
Expand Down
9 changes: 8 additions & 1 deletion src/coreclr/tools/aot/ILCompiler/ConfigurablePInvokePolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,16 @@ private IEnumerable<string> ModuleNameVariations(string name)
else
{
string suffix = _target.IsApplePlatform ? ".dylib" : ".so";
bool hasSharedLibraryExtension = name.EndsWith(suffix, StringComparison.Ordinal);
const string LibPrefix = "lib";
bool hasLibPrefix = name.StartsWith(LibPrefix, StringComparison.Ordinal);

if (name.EndsWith(suffix, StringComparison.Ordinal))
if (hasSharedLibraryExtension)
yield return name.Substring(0, name.Length - suffix.Length);
if (hasLibPrefix)
yield return name.Substring(LibPrefix.Length);
if (hasLibPrefix && hasSharedLibraryExtension)
yield return name.Substring(LibPrefix.Length, name.Length - suffix.Length - LibPrefix.Length);
}
}

Expand Down