From 24675c13bf352f531a66864b8da257465c2b9250 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Thu, 20 Jun 2024 14:19:47 +0200
Subject: [PATCH 1/3] ILCompiler: don't strip debug info from 'ilc' during
 source-build.

---
 src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index 823dab33c645c..59ad2013006c9 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -16,6 +16,7 @@
     <!-- Disable native AOT on FreeBSD when cross building from Linux. -->
     <NativeAotSupported Condition="'$(TargetOS)' == 'freebsd' and '$(CrossBuild)' == 'true'">false</NativeAotSupported>
     <PublishAot Condition="'$(NativeAotSupported)' == 'true'">true</PublishAot>
+    <StripSymbols Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(KeepNativeSymbols)' == 'true'">false</StripSymbols>
     <SysRoot Condition="'$(NativeAotSupported)' == 'true' and '$(CrossBuild)' == 'true' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
     <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
     <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>

From e8e138ac1a354e1efe011ad87fa9594876ddf4a2 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 24 Jun 2024 09:44:57 +0200
Subject: [PATCH 2/3] PR feedback.

---
 src/coreclr/tools/aot/AotCompilerCommon.props      | 1 +
 src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/tools/aot/AotCompilerCommon.props b/src/coreclr/tools/aot/AotCompilerCommon.props
index cc10648205810..579449dd14064 100644
--- a/src/coreclr/tools/aot/AotCompilerCommon.props
+++ b/src/coreclr/tools/aot/AotCompilerCommon.props
@@ -6,6 +6,7 @@
     <OptimizationPreference>Speed</OptimizationPreference>
     <ControlFlowGuard>Guard</ControlFlowGuard>
     <InvariantGlobalization>true</InvariantGlobalization>
+    <StripSymbols Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(KeepNativeSymbols)' == 'true'">false</StripSymbols>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
index 59ad2013006c9..823dab33c645c 100644
--- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
+++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
@@ -16,7 +16,6 @@
     <!-- Disable native AOT on FreeBSD when cross building from Linux. -->
     <NativeAotSupported Condition="'$(TargetOS)' == 'freebsd' and '$(CrossBuild)' == 'true'">false</NativeAotSupported>
     <PublishAot Condition="'$(NativeAotSupported)' == 'true'">true</PublishAot>
-    <StripSymbols Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(KeepNativeSymbols)' == 'true'">false</StripSymbols>
     <SysRoot Condition="'$(NativeAotSupported)' == 'true' and '$(CrossBuild)' == 'true' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
     <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
     <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>

From 408498956eeca95823dde7250b8a6b0436f91d82 Mon Sep 17 00:00:00 2001
From: Tom Deseyn <tom.deseyn@gmail.com>
Date: Mon, 24 Jun 2024 11:27:16 +0200
Subject: [PATCH 3/3] Remove DotNetBuildSourceOnly condition.

---
 src/coreclr/tools/aot/AotCompilerCommon.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/tools/aot/AotCompilerCommon.props b/src/coreclr/tools/aot/AotCompilerCommon.props
index 579449dd14064..3d20ee261a4b5 100644
--- a/src/coreclr/tools/aot/AotCompilerCommon.props
+++ b/src/coreclr/tools/aot/AotCompilerCommon.props
@@ -6,7 +6,7 @@
     <OptimizationPreference>Speed</OptimizationPreference>
     <ControlFlowGuard>Guard</ControlFlowGuard>
     <InvariantGlobalization>true</InvariantGlobalization>
-    <StripSymbols Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(KeepNativeSymbols)' == 'true'">false</StripSymbols>
+    <StripSymbols Condition="'$(KeepNativeSymbols)' == 'true'">false</StripSymbols>
   </PropertyGroup>
 
   <ItemGroup>