diff options
| author | Victor Stinner <vstinner@python.org> | 2023-09-29 10:17:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-29 10:17:49 (GMT) |
| commit | e260087a8e7f1a564f9b797af6291f99e225a73c (patch) | |
| tree | 169e014f091b5968f7d1e4e92812cd59780503bd | |
| parent | 8b626a47bafdb2d1ebb1321e50ffa5d6c721bf3a (diff) | |
| download | cpython-e260087a8e7f1a564f9b797af6291f99e225a73c.zip cpython-e260087a8e7f1a564f9b797af6291f99e225a73c.tar.gz cpython-e260087a8e7f1a564f9b797af6291f99e225a73c.tar.bz2 | |
gh-108716: make regen-global-objects no longer builds deepfreeze.c (#110078)
Remove more references to now unused Python/deepfreeze/deepfreeze.c.
| -rw-r--r-- | .github/workflows/build.yml | 3 | ||||
| -rw-r--r-- | Makefile.pre.in | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a60632d..ffcfbac 100644 --- 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 f7b52bd..d62b4d2 100644 --- 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 ############################################################################ |