gh-108716: make regen-global-objects no longer builds deepfreeze.c (#110078)

Remove more references to now unused Python/deepfreeze/deepfreeze.c.

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a60632dc565235507ad89a802896b4fee3633940..ffcfbac290b726f30f42bc98b29e184c344702f7 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -140,9 +140,6 @@ jobs:
         run: make regen-configure
       - name: Build CPython
         run: |
-          # Deepfreeze will usually cause global objects to be added or removed,
-          # so we run it before regen-global-objects gets rum (in regen-all).
-          make regen-deepfreeze
           make -j4 regen-all
           make regen-stdlib-module-names
       - name: Check for changes

diff --git a/Makefile.pre.in b/Makefile.pre.in
index f7b52bdab316f13e5297a8e2296a6e3020741a5b..d62b4d24b3e1839a6308afab7043c89de4c7290f 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -492,9 +492,6 @@ OBJECT_OBJS=        \
                Objects/weakrefobject.o \
                @PERF_TRAMPOLINE_OBJ@
 
-DEEPFREEZE_C = Python/deepfreeze/deepfreeze.c
-DEEPFREEZE_OBJS = Python/deepfreeze/deepfreeze.o
-
 ##########################################################################
 # objects that get linked into the Python library
 LIBRARY_OBJS_OMIT_FROZEN=      \
@@ -1252,9 +1249,7 @@ regen-frozen: Tools/build/freeze_modules.py $(FROZEN_FILES_IN)
 ############################################################################
 # Deepfreeze targets
 
-.PHONY: regen-deepfreeze
-regen-deepfreeze: $(DEEPFREEZE_C)
-
+DEEPFREEZE_C = Python/deepfreeze/deepfreeze.c
 DEEPFREEZE_DEPS=$(srcdir)/Tools/build/deepfreeze.py Include/internal/pycore_global_strings.h $(FREEZE_MODULE_DEPS) $(FROZEN_FILES_OUT)
 
 # BEGIN: deepfreeze modules
@@ -1294,10 +1289,9 @@ regen-importlib: regen-frozen
 # Global objects
 
 # Dependencies which can add and/or remove _Py_ID() identifiers:
-# - deepfreeze.c
 # - "make clinic"
 .PHONY: regen-global-objects
-regen-global-objects: $(srcdir)/Tools/build/generate_global_objects.py $(DEEPFREEZE_C) clinic
+regen-global-objects: $(srcdir)/Tools/build/generate_global_objects.py clinic
        $(PYTHON_FOR_REGEN) $(srcdir)/Tools/build/generate_global_objects.py
 
 ############################################################################