Skip to content

Commit 834498e

Browse files
authored
bpo-44131: Fix Makefile for test_frozenmain (GH-26203)
Remove Programs/test_frozenmain.h Makefile target: it ran make in parallel which caused build errors on LTO+PGO builds.
1 parent eaede0d commit 834498e

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Makefile.pre.in

+1-3
Original file line numberDiff line numberDiff line change
@@ -720,15 +720,13 @@ Makefile Modules/config.c: Makefile.pre \
720720
@mv config.c Modules
721721
@echo "The Makefile was updated, you may need to re-run make."
722722

723+
.PHONY: regen-test-frozenmain
723724
regen-test-frozenmain: $(BUILDPYTHON)
724725
# Regenerate Programs/test_frozenmain.h
725726
# from Programs/test_frozenmain.py
726727
# using Programs/freeze_test_frozenmain.py
727728
$(RUNSHARED) ./$(BUILDPYTHON) Programs/freeze_test_frozenmain.py Programs/test_frozenmain.h
728729

729-
Programs/test_frozenmain.h: Programs/freeze_test_frozenmain.py Programs/test_frozenmain.py
730-
$(MAKE) regen-test-frozenmain
731-
732730
Programs/_testembed: Programs/_testembed.o $(LIBRARY_DEPS)
733731
$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
734732

Programs/test_frozenmain.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Programs/test_frozenmain.py

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Script used to test Py_FrozenMain(): see test_embed.test_frozenmain().
2+
# Run "make regen-test-frozenmain" if you modify this test.
3+
14
import sys
25
import _testinternalcapi
36

0 commit comments

Comments
 (0)