From 223bf508d5fbc2d0f3078b116aaef46912e162ae Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Tue, 27 Jun 2023 08:38:23 +0200
Subject: [PATCH 1/3] Build native bits for the host architecture when
 targeting iOS platforms with Native AOT

---
 eng/Subsets.props                 | 2 +-
 src/coreclr/crosscomponents.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 25375fc133dd51..180ccd25d79ffc 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -303,7 +303,7 @@
   <!-- When targeting the iOS platforms with Native AOT, build the ClrAllJitsSubset and the Ilc for the host  -->
   <PropertyGroup>
     <IsNativeAOTHostBuildEnabled Condition="$(_subset.Contains('+clr.nativeaotruntime+')) and '$(NativeAotSupported)' == 'true' and '$(PrimaryRuntimeFlavor)' == 'CoreCLR' and '$(TargetsAppleMobile)' == 'true'">true</IsNativeAOTHostBuildEnabled>
-    <NativeAOTAdditionalProperties Condition="'$(IsNativeAOTHostBuildEnabled)' == 'true'">TargetOS=osx</NativeAOTAdditionalProperties>
+    <NativeAOTAdditionalProperties Condition="'$(IsNativeAOTHostBuildEnabled)' == 'true'">TargetOS=osx;TargetArchitecture=$(BuildArchitecture)</NativeAOTAdditionalProperties>
   </PropertyGroup>
   <ItemGroup Condition="'$(IsNativeAOTHostBuildEnabled)' == 'true'">
     <ProjectToBuild
diff --git a/src/coreclr/crosscomponents.cmake b/src/coreclr/crosscomponents.cmake
index 2bd288221192f9..6af0f327c6a00e 100644
--- a/src/coreclr/crosscomponents.cmake
+++ b/src/coreclr/crosscomponents.cmake
@@ -1,5 +1,5 @@
 # Add targets to the crosscomponents subcomponent build
-if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS)
+if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS OR CLR_CMAKE_TARGET_MACCATALYST)
     install_clr (TARGETS
         jitinterface_${ARCH_HOST_NAME}
         DESTINATIONS .

From 3439631e636fa5101425f910a6faa7fd9e027d4f Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Tue, 27 Jun 2023 11:27:13 +0200
Subject: [PATCH 2/3] Revert the crosscomponets condition

---
 eng/Subsets.props                 | 9 +++++++--
 src/coreclr/crosscomponents.cmake | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 180ccd25d79ffc..ecf8def322fbf9 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -308,8 +308,13 @@
   <ItemGroup Condition="'$(IsNativeAOTHostBuildEnabled)' == 'true'">
     <ProjectToBuild
       Include="$(CoreClrProjectRoot)runtime.proj"
-      AdditionalProperties="$(NativeAOTAdditionalProperties);
-                            ClrAllJitsSubset=true"
+      AdditionalProperties="%(AdditionalProperties);
+                            $(NativeAOTAdditionalProperties);
+                            ClrAllJitsSubset=true;
+                            ClrCrossComponentsSubset=true;
+                            PgoInstrument=false;
+                            NoPgoOptimize=true;
+                            CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1"
       Category="clr" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Category="clr" AdditionalProperties="$(NativeAOTAdditionalProperties)" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)nativeaot\BuildIntegration\BuildIntegration.proj" Category="clr" AdditionalProperties="$(NativeAOTAdditionalProperties)" />
diff --git a/src/coreclr/crosscomponents.cmake b/src/coreclr/crosscomponents.cmake
index 6af0f327c6a00e..2bd288221192f9 100644
--- a/src/coreclr/crosscomponents.cmake
+++ b/src/coreclr/crosscomponents.cmake
@@ -1,5 +1,5 @@
 # Add targets to the crosscomponents subcomponent build
-if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS OR CLR_CMAKE_TARGET_IOS OR CLR_CMAKE_TARGET_TVOS OR CLR_CMAKE_TARGET_MACCATALYST)
+if (CLR_CMAKE_HOST_OS STREQUAL CLR_CMAKE_TARGET_OS)
     install_clr (TARGETS
         jitinterface_${ARCH_HOST_NAME}
         DESTINATIONS .

From 0677131fd1bf20c24f3526532090be0ebaeee696 Mon Sep 17 00:00:00 2001
From: Milos Kotlar <kotlarmilos@gmail.com>
Date: Tue, 27 Jun 2023 12:03:45 +0200
Subject: [PATCH 3/3] Don't build ILCompiler_crossarch.csproj

---
 eng/Subsets.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index ecf8def322fbf9..bfa808ab25cd95 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -318,7 +318,6 @@
       Category="clr" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Category="clr" AdditionalProperties="$(NativeAOTAdditionalProperties)" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)nativeaot\BuildIntegration\BuildIntegration.proj" Category="clr" AdditionalProperties="$(NativeAOTAdditionalProperties)" />
-    <ProjectToBuild Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'" Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_crossarch.csproj" Category="clr" AdditionalProperties="$(NativeAOTAdditionalProperties)" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+crossdacpack+'))">