From 42f5a601c9a8d42892827af689827013757f6cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Thu, 3 Aug 2023 17:05:42 +0900
Subject: [PATCH 1/2] Split off system libraries into a separate ItemGroup

Should help with https://github.com/dotnet/runtime/pull/88294#issuecomment-1663268829.
---
 .../Microsoft.NETCore.Native.Unix.targets     | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index 33b635de082de2..e349bafd9f1c87 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -105,6 +105,23 @@ The .NET Foundation licenses this file to you under the MIT license.
       <NativeFramework Condition="!$(_targetOS.StartsWith('tvos'))" Include="GSS" />
     </ItemGroup>
 
+    <ItemGroup>
+      <NativeSystemLibrary Include="-lstdc++" Condition="'$(LinkStandardCPlusPlusLibrary)' == 'true'" />
+      <NativeSystemLibrary Include="-ldl" />
+      <NativeSystemLibrary Include="-lobjc" Condition="'$(_IsApplePlatform)' == 'true'" />
+      <NativeSystemLibrary Include="-lswiftCore" Condition="'$(_targetOS)' == 'osx'" />
+      <NativeSystemLibrary Include="-lswiftFoundation" Condition="'$(_targetOS)' == 'osx'" />
+      <NativeSystemLibrary Include="-lz" />
+      <NativeSystemLibrary Include="-lrt" Condition="'$(_IsApplePlatform)' != 'true' and '$(_linuxLibcFlavor)' != 'bionic'" />
+      <NativeSystemLibrary Include="-llog" Condition="'$(_linuxLibcFlavor)' == 'bionic'" />
+      <NativeSystemLibrary Include="-licucore" Condition="'$(_IsApplePlatform)' == 'true'" />
+      <NativeSystemLibrary Include="-lm" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ExtraLinkerArg Include="-segprot,__THUNKS,rx,rx" Condition="'$(_IsiOSLikePlatform)' == 'true'" />
+    </ItemGroup>
+
     <ItemGroup>
       <LinkerArg Include="-gz=zlib" Condition="'$(CompressSymbols)' != 'false'" />
       <LinkerArg Include="-fuse-ld=$(LinkerFlavor)" Condition="'$(LinkerFlavor)' != ''" />
@@ -120,19 +137,10 @@ The .NET Foundation licenses this file to you under the MIT license.
       <LinkerArg Include="-Wl,--as-needed" Condition="'$(_IsApplePlatform)' != 'true'" />
       <LinkerArg Include="-Wl,-e0x0" Condition="'$(NativeLib)' == 'Shared' and '$(_IsApplePlatform)' != 'true'" />
       <LinkerArg Include="-pthread" Condition="'$(_IsApplePlatform)' != 'true'" />
-      <LinkerArg Include="-lstdc++" Condition="'$(LinkStandardCPlusPlusLibrary)' == 'true'" />
-      <LinkerArg Include="-ldl" />
-      <LinkerArg Include="-lobjc" Condition="'$(_IsApplePlatform)' == 'true'" />
-      <LinkerArg Include="-lswiftCore" Condition="'$(_targetOS)' == 'osx'" />
-      <LinkerArg Include="-lswiftFoundation" Condition="'$(_targetOS)' == 'osx'" />
-      <LinkerArg Include="-lz" />
-      <LinkerArg Include="-lrt" Condition="'$(_IsApplePlatform)' != 'true' and '$(_linuxLibcFlavor)' != 'bionic'" />
-      <LinkerArg Include="-llog" Condition="'$(_linuxLibcFlavor)' == 'bionic'" />
-      <LinkerArg Include="-licucore" Condition="'$(_IsApplePlatform)' == 'true'" />
+      <LinkerArg Include="@(NativeSystemLibrary->'-l%(Identity)')" />
       <LinkerArg Include="-L/usr/lib/swift" Condition="'$(_targetOS)' == 'osx'" />
       <LinkerArg Include="@(StaticICULibs)" Condition="'$(StaticICULinking)' == 'true'" />
       <LinkerArg Include="@(StaticSslLibs)" Condition="'$(StaticOpenSslLinking)' == 'true'" />
-      <LinkerArg Include="-lm" />
       <LinkerArg Include="-static" Condition="'$(StaticExecutable)' == 'true' and '$(PositionIndependentExecutable)' == 'false'" />
       <LinkerArg Include="-static-pie" Condition="'$(StaticExecutable)' == 'true' and '$(PositionIndependentExecutable)' != 'false'" />
       <LinkerArg Include="-dynamiclib" Condition="'$(_IsApplePlatform)' == 'true' and '$(NativeLib)' == 'Shared'" />
@@ -152,7 +160,7 @@ The .NET Foundation licenses this file to you under the MIT license.
       <LinkerArg Include="-L/usr/local/lib -lgssapi_krb5" Condition="'$(_targetOS)' == 'freebsd'" />
       <!-- FreeBSD's inotify is an installed package and not found in default libraries  -->
       <LinkerArg Include="-L/usr/local/lib -linotify" Condition="'$(_targetOS)' == 'freebsd'" />
-      <LinkerArg Include="-Wl,-segprot,__THUNKS,rx,rx" Condition="'$(_IsiOSLikePlatform)' == 'true'" />
+      <LinkerArg Include="@(ExtraLinkerArg->'-Wl,%(Identity)')" />
       <LinkerArg Include="@(NativeFramework->'-framework %(Identity)')" Condition="'$(_IsApplePlatform)' == 'true'" />
       <LinkerArg Include="-Wl,--eh-frame-hdr" Condition="'$(_IsApplePlatform)' != 'true'" />
     </ItemGroup>

From 6f8e9a632705a2cf8cf8d2b280f8121ea9970b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Thu, 3 Aug 2023 17:37:18 +0900
Subject: [PATCH 2/2] Update Microsoft.NETCore.Native.Unix.targets

---
 .../Microsoft.NETCore.Native.Unix.targets     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index e349bafd9f1c87..8ce90431a7ca89 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -106,16 +106,16 @@ The .NET Foundation licenses this file to you under the MIT license.
     </ItemGroup>
 
     <ItemGroup>
-      <NativeSystemLibrary Include="-lstdc++" Condition="'$(LinkStandardCPlusPlusLibrary)' == 'true'" />
-      <NativeSystemLibrary Include="-ldl" />
-      <NativeSystemLibrary Include="-lobjc" Condition="'$(_IsApplePlatform)' == 'true'" />
-      <NativeSystemLibrary Include="-lswiftCore" Condition="'$(_targetOS)' == 'osx'" />
-      <NativeSystemLibrary Include="-lswiftFoundation" Condition="'$(_targetOS)' == 'osx'" />
-      <NativeSystemLibrary Include="-lz" />
-      <NativeSystemLibrary Include="-lrt" Condition="'$(_IsApplePlatform)' != 'true' and '$(_linuxLibcFlavor)' != 'bionic'" />
-      <NativeSystemLibrary Include="-llog" Condition="'$(_linuxLibcFlavor)' == 'bionic'" />
-      <NativeSystemLibrary Include="-licucore" Condition="'$(_IsApplePlatform)' == 'true'" />
-      <NativeSystemLibrary Include="-lm" />
+      <NativeSystemLibrary Include="stdc++" Condition="'$(LinkStandardCPlusPlusLibrary)' == 'true'" />
+      <NativeSystemLibrary Include="dl" />
+      <NativeSystemLibrary Include="objc" Condition="'$(_IsApplePlatform)' == 'true'" />
+      <NativeSystemLibrary Include="swiftCore" Condition="'$(_targetOS)' == 'osx'" />
+      <NativeSystemLibrary Include="swiftFoundation" Condition="'$(_targetOS)' == 'osx'" />
+      <NativeSystemLibrary Include="z" />
+      <NativeSystemLibrary Include="rt" Condition="'$(_IsApplePlatform)' != 'true' and '$(_linuxLibcFlavor)' != 'bionic'" />
+      <NativeSystemLibrary Include="log" Condition="'$(_linuxLibcFlavor)' == 'bionic'" />
+      <NativeSystemLibrary Include="icucore" Condition="'$(_IsApplePlatform)' == 'true'" />
+      <NativeSystemLibrary Include="m" />
     </ItemGroup>
 
     <ItemGroup>