Skip to content

Commit a91d820

Browse files
authored
Skip inbuild projects in stage2 (built by stage1) (#113243)
* Skip inbuild projects in stage2 (built by stage1) * Update comment
1 parent aa5c785 commit a91d820

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

eng/Subsets.props

+6-3
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,12 @@
440440
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" Category="clr" />
441441
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Condition="'$(NativeAotSupported)' == 'true' and '$(StageOneBuild)' != 'true'" Category="clr" />
442442

443-
<!-- Always build the in-build variants of these tools. They run on the host machine, which we always have LKG packs for. -->
444-
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_inbuild.csproj" Category="clr" />
445-
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" />
443+
<!--
444+
Always build the in-build variants of these tools. They run on the host machine, which we always have LKG packs for.
445+
For two-stage builds, we omit this step during stage2 since stage1 covers it.
446+
-->
447+
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_inbuild.csproj" Category="clr" Condition="'$(StageTwoBuild)' != 'true'" />
448+
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_inbuild.csproj" Category="clr" Condition="'$(StageTwoBuild)' != 'true'" />
446449

447450
<ProjectToBuild Condition="'$(TargetOS)' == 'windows' or ('$(TargetOS)' == 'linux' and ('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'arm64')) or '$(TargetOS)' == 'osx'" Include="$(CoreClrProjectRoot)tools\SuperFileCheck\SuperFileCheck.csproj" Category="clr" />
448451

0 commit comments

Comments
 (0)