From: Steve Dower <steve.dower@python.org>
Date: Thu, 29 Jul 2021 22:18:17 +0000 (+0100)
Subject: bpo-44479: Do not regenerate files during a PGO build as it will invalidate the profi... 
X-Git-Tag: v3.10.0rc1~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b984d1cccc9547c2c16203e9ab2b2959fbabcde;p=thirdparty%2FPython%2Fcpython.git

bpo-44479: Do not regenerate files during a PGO build as it will invalidate the profile. (GH-27462)

Also remove some unused code that should not have been backported.
---

diff --git a/PCbuild/regen.targets b/PCbuild/regen.targets
index a1de340ab544..ff56d1148e84 100644
--- a/PCbuild/regen.targets
+++ b/PCbuild/regen.targets
@@ -78,16 +78,14 @@
           WorkingDirectory="$(PySourcePath)" />
   </Target>
 
-  <Target Name="Regen" DependsOnTargets="_TouchRegenSources;_RegenPegen;_RegenAST_H;_RegenOpcodes;_RegenTokens;_RegenKeywords">
+  <Target Name="Regen"
+          Condition="$(Configuration) != 'PGUpdate'"
+          DependsOnTargets="_TouchRegenSources;_RegenPegen;_RegenAST_H;_RegenOpcodes;_RegenTokens;_RegenKeywords">
     <Message Text="Generated sources are up to date" Importance="high" />
   </Target>
 
 
   <ItemGroup>
-    <_TestFrozenSources Include="$(PySourcePath)Programs\freeze_test_frozenmain.py;
-                                 $(PySourcePath)Programs\test_frozenmain.py;
-                                 @(_OpcodeOutputs)" />
-    <_TestFrozenOutputs Include="$(PySourcePath)Programs\test_frozenmain.h" />
     <_LicenseSources Include="$(PySourcePath)LICENSE;
                               $(PySourcePath)PC\crtlicense.txt;
                               $(bz2Dir)LICENSE;
@@ -112,5 +110,7 @@
     <Message Text="Wrote $(OutDir)LICENSE.txt" Importance="high" />
   </Target>
 
-  <Target Name="PostBuildRegen" DependsOnTargets="_RegenLicense" />
+  <Target Name="PostBuildRegen"
+          Condition="$(Configuration) != 'PGInstrument' and $(Configuration) != 'PGUpdate'"
+          DependsOnTargets="_RegenLicense" />
 </Project>