From 1b03a7ddca5768f99d8ca2af474e53119dcef51c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 14 Apr 2026 18:02:18 +0000
Subject: [PATCH 1/3] Initial plan


From 4e86e36ab78a0bb9d4d2c45d7e3bc54cec1efec5 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 14 Apr 2026 18:11:45 +0000
Subject: [PATCH 2/3] Add macOS SDK Swift library path to NativeAOT linker
 arguments

On macOS 15+, Swift stdlib shims may only exist under the Xcode SDK
path and not in /usr/lib/swift. This causes NativeAOT builds to fail
intermittently when linking libSystem.Security.Cryptography.Native.Apple.a.

Resolve the macOS SDK path via `xcrun --show-sdk-path` and add it as
an additional -L linker search path. iOS-like platforms are unaffected
since they already pass -isysroot which remaps -L paths automatically.

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/1ea30f49-d15d-45c6-be1d-9572f6f8bf28

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../Microsoft.NETCore.Native.Unix.targets                | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index 48b8e6ef368054..b20d4d0aaa9bc2 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -128,6 +128,14 @@ The .NET Foundation licenses this file to you under the MIT license.
     <Error Condition="'$(_HasDefaultSysRoot)' != 'true' and '$(_IsiOSLikePlatform)' == 'true' and !Exists('$(SysRoot)')"
       Text="Apple SDK was not found in: '$(SysRoot)'" />
 
+    <!-- Resolve macOS SDK path for Swift library lookup. On macOS 15+, Swift stdlib shims
+         may only exist under the SDK (e.g. <Xcode SDK>/usr/lib/swift) and not in /usr/lib/swift.
+         iOS-like platforms already get this through -isysroot which remaps -L paths. -->
+    <Exec Command="xcrun --show-sdk-path" IgnoreExitCode="true" StandardOutputImportance="Low" ConsoleToMsBuild="true"
+          Condition="'$(_targetOS)' == 'osx' and '$(_HasDefaultSysRoot)' != 'true'">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_MacOSXSdkPath" />
+    </Exec>
+
     <!--
       Include any managed code libraries first, followed by native shims, followed then by the runtimes.
       This order ensures that all dependencies are met in order:
@@ -252,6 +260,7 @@ The .NET Foundation licenses this file to you under the MIT license.
       <LinkerArg Include="-pthread" Condition="'$(_IsApplePlatform)' != 'true'" />
       <LinkerArg Include="@(NativeSystemLibrary->'-l%(Identity)')" />
       <LinkerArg Include="-L/usr/lib/swift" Condition="'$(_IsApplePlatform)' == 'true'" />
+      <LinkerArg Include="-L&quot;$(_MacOSXSdkPath)/usr/lib/swift&quot;" Condition="'$(_targetOS)' == 'osx' and '$(_MacOSXSdkPath)' != ''" />
       <LinkerArg Include="@(StaticICULibs)" Condition="'$(StaticICULinking)' == 'true'" />
       <LinkerArg Include="@(StaticSslLibs)" Condition="'$(StaticOpenSslLinking)' == 'true'" />
       <LinkerArg Include="-static" Condition="'$(StaticExecutable)' == 'true' and '$(PositionIndependentExecutable)' == 'false'" />

From e858ef0bf87f1805a5a8debda18a3b492dd68f57 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Apr 2026 05:01:32 +0000
Subject: [PATCH 3/3] Refactor: extend xcrun SDK resolution to all Apple
 platforms instead of separate macOS block

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/1cf65e66-4b7b-409c-bd4c-58c477560e6f

Co-authored-by: agocke <515774+agocke@users.noreply.github.com>
---
 .../Microsoft.NETCore.Native.Unix.targets        | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index b20d4d0aaa9bc2..bb5dbed5be9cc2 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -102,12 +102,13 @@ The .NET Foundation licenses this file to you under the MIT license.
       <AppleMinOSVersion Condition="'$(AppleMinOSVersion)' == ''">14.0</AppleMinOSVersion>
       <TargetTriple Condition="'$(_targetArchitecture)' == 'x64'">x86_64-apple-macos$(AppleMinOSVersion)</TargetTriple>
       <TargetTriple Condition="'$(_targetArchitecture)' == 'arm64'">arm64-apple-macos$(AppleMinOSVersion)</TargetTriple>
+      <_AppleSdkName>macosx</_AppleSdkName>
     </PropertyGroup>
 
     <Error Condition="'$(_IsiOSLikePlatform)' == 'true' and ('$(_AppleSdkName)' == '' or '$(CrossCompileArch)' == '' or '$(_AppleTripleOS)' == ''  or '$(AppleMinOSVersion)' == '' or '$(_AppleTripleAbi)' == '')"
       Text="One of the required Apple SDK properties is empty and was not properly resolved: _AppleSdkName = '$(_AppleSdkName)' CrossCompileArch = '$(CrossCompileArch)' _AppleTripleOS = '$(_AppleTripleOS)' AppleMinOSVersion = '$(AppleMinOSVersion)' _AppleTripleAbi = '$(_AppleTripleAbi)'" />
 
-    <PropertyGroup Condition="'$(_IsiOSLikePlatform)' == 'true'">
+    <PropertyGroup Condition="'$(_IsApplePlatform)' == 'true'">
       <Xcrun Condition="'$(Xcrun)' == ''">xcrun</Xcrun>
       <_WhereXcrun>0</_WhereXcrun>
     </PropertyGroup>
@@ -116,26 +117,18 @@ The .NET Foundation licenses this file to you under the MIT license.
       <_HasDefaultSysRoot Condition="'$(SysRoot)' != ''">true</_HasDefaultSysRoot>
     </PropertyGroup>
 
-    <Exec Command="command -v &quot;$(Xcrun)&quot;" IgnoreExitCode="true" StandardOutputImportance="Low" Condition="'$(_IsiOSLikePlatform)' == 'true' And '$(_HasDefaultSysRoot)' != 'true'">
+    <Exec Command="command -v &quot;$(Xcrun)&quot;" IgnoreExitCode="true" StandardOutputImportance="Low" Condition="'$(_IsApplePlatform)' == 'true' And '$(_HasDefaultSysRoot)' != 'true'">
       <Output TaskParameter="ExitCode" PropertyName="_WhereXcrun" />
     </Exec>
     <Error Condition="'$(_WhereXcrun)' != '0' and '$(_IsiOSLikePlatform)' == 'true'"
       Text="'$(Xcrun)' not found in PATH. Make sure '$(Xcrun)' is available in PATH." />
 
-    <Exec Command="&quot;$(Xcrun)&quot; --sdk $(_AppleSdkName) --show-sdk-path" IgnoreExitCode="true" StandardOutputImportance="Low" Condition="'$(_HasDefaultSysRoot)' != 'true' and '$(_IsiOSLikePlatform)' == 'true'" ConsoleToMsBuild="true">
+    <Exec Command="&quot;$(Xcrun)&quot; --sdk $(_AppleSdkName) --show-sdk-path" IgnoreExitCode="true" StandardOutputImportance="Low" Condition="'$(_HasDefaultSysRoot)' != 'true' and '$(_IsApplePlatform)' == 'true'" ConsoleToMsBuild="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="SysRoot" />
     </Exec>
     <Error Condition="'$(_HasDefaultSysRoot)' != 'true' and '$(_IsiOSLikePlatform)' == 'true' and !Exists('$(SysRoot)')"
       Text="Apple SDK was not found in: '$(SysRoot)'" />
 
-    <!-- Resolve macOS SDK path for Swift library lookup. On macOS 15+, Swift stdlib shims
-         may only exist under the SDK (e.g. <Xcode SDK>/usr/lib/swift) and not in /usr/lib/swift.
-         iOS-like platforms already get this through -isysroot which remaps -L paths. -->
-    <Exec Command="xcrun --show-sdk-path" IgnoreExitCode="true" StandardOutputImportance="Low" ConsoleToMsBuild="true"
-          Condition="'$(_targetOS)' == 'osx' and '$(_HasDefaultSysRoot)' != 'true'">
-      <Output TaskParameter="ConsoleOutput" PropertyName="_MacOSXSdkPath" />
-    </Exec>
-
     <!--
       Include any managed code libraries first, followed by native shims, followed then by the runtimes.
       This order ensures that all dependencies are met in order:
@@ -260,7 +253,6 @@ The .NET Foundation licenses this file to you under the MIT license.
       <LinkerArg Include="-pthread" Condition="'$(_IsApplePlatform)' != 'true'" />
       <LinkerArg Include="@(NativeSystemLibrary->'-l%(Identity)')" />
       <LinkerArg Include="-L/usr/lib/swift" Condition="'$(_IsApplePlatform)' == 'true'" />
-      <LinkerArg Include="-L&quot;$(_MacOSXSdkPath)/usr/lib/swift&quot;" Condition="'$(_targetOS)' == 'osx' and '$(_MacOSXSdkPath)' != ''" />
       <LinkerArg Include="@(StaticICULibs)" Condition="'$(StaticICULinking)' == 'true'" />
       <LinkerArg Include="@(StaticSslLibs)" Condition="'$(StaticOpenSslLinking)' == 'true'" />
       <LinkerArg Include="-static" Condition="'$(StaticExecutable)' == 'true' and '$(PositionIndependentExecutable)' == 'false'" />