diff options
| author | Victor Stinner <vstinner@python.org> | 2021-05-18 06:40:37 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 06:40:37 (GMT) |
| commit | 834498e178684a7e2da49b4efe1adea33e0026b0 (patch) | |
| tree | c3ef0398d242eb4565e0e04b3d6806e20a5df631 | |
| parent | eaede0ded72e67cee4a91c086847d54cb64ca74c (diff) | |
| download | cpython-834498e178684a7e2da49b4efe1adea33e0026b0.zip cpython-834498e178684a7e2da49b4efe1adea33e0026b0.tar.gz cpython-834498e178684a7e2da49b4efe1adea33e0026b0.tar.bz2 | |
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.
| -rw-r--r-- | Makefile.pre.in | 4 | ||||
| -rw-r--r-- | Programs/test_frozenmain.h | 2 | ||||
| -rw-r--r-- | Programs/test_frozenmain.py | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 83788a6..798c53f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -720,15 +720,13 @@ Makefile Modules/config.c: Makefile.pre \ @mv config.c Modules @echo "The Makefile was updated, you may need to re-run make." +.PHONY: regen-test-frozenmain regen-test-frozenmain: $(BUILDPYTHON) # Regenerate Programs/test_frozenmain.h # from Programs/test_frozenmain.py # using Programs/freeze_test_frozenmain.py $(RUNSHARED) ./$(BUILDPYTHON) Programs/freeze_test_frozenmain.py Programs/test_frozenmain.h -Programs/test_frozenmain.h: Programs/freeze_test_frozenmain.py Programs/test_frozenmain.py - $(MAKE) regen-test-frozenmain - Programs/_testembed: Programs/_testembed.o $(LIBRARY_DEPS) $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) diff --git a/Programs/test_frozenmain.h b/Programs/test_frozenmain.h index ac3dfd3..e680b80 100644 --- a/Programs/test_frozenmain.h +++ b/Programs/test_frozenmain.h @@ -25,6 +25,6 @@ unsigned char M_test_frozenmain[] = { 169,0,114,7,0,0,0,114,7,0,0,0,250,18,116,101, 115,116,95,102,114,111,122,101,110,109,97,105,110,46,112,121, 218,8,60,109,111,100,117,108,101,62,1,0,0,0,115,16, - 0,0,0,8,0,8,1,8,2,12,1,12,1,18,1,18, + 0,0,0,8,3,8,1,8,2,12,1,12,1,18,1,18, 1,22,1,243,0,0,0,0, }; diff --git a/Programs/test_frozenmain.py b/Programs/test_frozenmain.py index aa79106..928b9ea 100644 --- a/Programs/test_frozenmain.py +++ b/Programs/test_frozenmain.py @@ -1,3 +1,6 @@ +# Script used to test Py_FrozenMain(): see test_embed.test_frozenmain(). +# Run "make regen-test-frozenmain" if you modify this test. + import sys import _testinternalcapi |