From 95d0c13eb4742c2f413b16615110050529f3c5dc Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Fri, 7 Mar 2025 23:45:45 +0200
Subject: [PATCH 1/2] Skip inbuild projects in stage2 (built by stage1)

---
 eng/Subsets.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index aa4da501a51acc..0611a110d536ee 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -441,8 +441,8 @@
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" Category="clr" />
 
     <!-- Always build the in-build variants of these tools. They run on the host machine, which we always have LKG packs for. -->
-    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_inbuild.csproj" Category="clr" />
-    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_inbuild.csproj" Category="clr" Condition="'$(StageTwoBuild)' != 'true'" />
+    <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" Condition="'$(StageTwoBuild)' != 'true'" />
 
     <ProjectToBuild Condition="'$(TargetOS)' == 'windows' or ('$(TargetOS)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')) or '$(TargetOS)' == 'osx'" Include="$(CoreClrProjectRoot)tools\SuperFileCheck\SuperFileCheck.csproj" Category="clr" />
 

From 61ab870f64300c0b6da6a2a7084580bc7e851028 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Sat, 8 Mar 2025 03:48:23 +0200
Subject: [PATCH 2/2] Update comment

---
 eng/Subsets.props | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 0611a110d536ee..45dd4d7a2c0058 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -440,7 +440,10 @@
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" Category="clr" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" Category="clr" />
 
-    <!-- Always build the in-build variants of these tools. They run on the host machine, which we always have LKG packs for. -->
+    <!--
+      Always build the in-build variants of these tools. They run on the host machine, which we always have LKG packs for.
+      For two-stage builds, we omit this step during stage2 since stage1 covers it.
+    -->
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_inbuild.csproj" Category="clr" Condition="'$(StageTwoBuild)' != 'true'" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" Condition="'$(StageTwoBuild)' != 'true'" />