diff options
| author | David Wrighton <davidwr@microsoft.com> | 2021-03-20 00:06:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-20 00:06:19 +0300 |
| commit | 88be24b566d6408417c27a20dc1df91516d01a59 (patch) | |
| tree | 8d42f31b80ec24314833840929e59cadeda836a1 /src/coreclr/crossgen-corelib.proj | |
| parent | 7072d202aa5b19e37a61d30a2b145ad17b3fce2d (diff) | |
Fix incremental build R2R of System.Private.CoreLib (#49894)
- Add dependency on newly compiled crossgen2 binaries
- Will force recompile of S.P.C if the ready to run compiler changes in addition to recompiling if S.P.C changes
Diffstat (limited to 'src/coreclr/crossgen-corelib.proj')
| -rw-r--r-- | src/coreclr/crossgen-corelib.proj | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/coreclr/crossgen-corelib.proj b/src/coreclr/crossgen-corelib.proj index 13e93155ef8..2399255b78d 100644 --- a/src/coreclr/crossgen-corelib.proj +++ b/src/coreclr/crossgen-corelib.proj @@ -40,6 +40,11 @@ <BuildPerfMap Condition="$(BuildDll) and '$(TargetOS)' == 'Linux'">true</BuildPerfMap> </PropertyGroup> + <ItemGroup> + <CrossGen2DllFiles Condition="'$(CrossDir)' == ''" Include="$(BinDir)/crossgen2/*" /> + <CrossGen2DllFiles Condition="'$(CrossDir)' != ''" Include="$(BinDir)/$(CrossDir)/crossgen2/*" /> + </ItemGroup> + <PropertyGroup> <CoreLibAssemblyName>System.Private.CoreLib</CoreLibAssemblyName> <CoreLibInputPath>$([MSBuild]::NormalizePath('$(BinDir)', 'IL', '$(CoreLibAssemblyName).dll'))</CoreLibInputPath> @@ -53,7 +58,7 @@ <Target Name="InvokeCrossgen" DependsOnTargets="PrepareForCrossgen" - Inputs="$(CoreLibInputPath)" + Inputs="$(CoreLibInputPath);@(CrossGen2DllFiles)" Outputs="$(CoreLibOutputPath);$(CoreLibNiPdbPath);$(CoreLibPerfMapPath)" AfterTargets="Build"> |