Skip to content

Commit 9f5426d

Browse files
committed
gh-108716: make regen-global-objects no longer builds deepfreeze.c
Remove more references to now unused Python/deepfreeze/deepfreeze.c.
1 parent 05079d9 commit 9f5426d

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,6 @@ jobs:
140140
run: make regen-configure
141141
- name: Build CPython
142142
run: |
143-
# Deepfreeze will usually cause global objects to be added or removed,
144-
# so we run it before regen-global-objects gets rum (in regen-all).
145-
make regen-deepfreeze
146143
make -j4 regen-all
147144
make regen-stdlib-module-names
148145
- name: Check for changes

Makefile.pre.in

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,6 @@ OBJECT_OBJS= \
492492
Objects/weakrefobject.o \
493493
@PERF_TRAMPOLINE_OBJ@
494494

495-
DEEPFREEZE_C = Python/deepfreeze/deepfreeze.c
496-
DEEPFREEZE_OBJS = Python/deepfreeze/deepfreeze.o
497-
498495
##########################################################################
499496
# objects that get linked into the Python library
500497
LIBRARY_OBJS_OMIT_FROZEN= \
@@ -1252,9 +1249,7 @@ regen-frozen: Tools/build/freeze_modules.py $(FROZEN_FILES_IN)
12521249
############################################################################
12531250
# Deepfreeze targets
12541251

1255-
.PHONY: regen-deepfreeze
1256-
regen-deepfreeze: $(DEEPFREEZE_C)
1257-
1252+
DEEPFREEZE_C = Python/deepfreeze/deepfreeze.c
12581253
DEEPFREEZE_DEPS=$(srcdir)/Tools/build/deepfreeze.py Include/internal/pycore_global_strings.h $(FREEZE_MODULE_DEPS) $(FROZEN_FILES_OUT)
12591254

12601255
# BEGIN: deepfreeze modules
@@ -1294,10 +1289,9 @@ regen-importlib: regen-frozen
12941289
# Global objects
12951290

12961291
# Dependencies which can add and/or remove _Py_ID() identifiers:
1297-
# - deepfreeze.c
12981292
# - "make clinic"
12991293
.PHONY: regen-global-objects
1300-
regen-global-objects: $(srcdir)/Tools/build/generate_global_objects.py $(DEEPFREEZE_C) clinic
1294+
regen-global-objects: $(srcdir)/Tools/build/generate_global_objects.py clinic
13011295
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/build/generate_global_objects.py
13021296

13031297
############################################################################

0 commit comments

Comments
 (0)