Repository navigation
Commit 1d67431
committed
bpo-29243: Fix Makefile with respect to --enable-optimizations
When using the Profile Guided Optimization (./configure --enable-optimizations)
Python is built not only during `make` but rebuilt again during `make test`,
`make install` and others. This patch fixes the issue.
Note that this fix produces no change at all in the Makefile if configure is
run witout --enable-optimizations.1 parent c07b3a1 commit 1d67431
2 files changed
Lines changed: 11 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -999,7 +999,7 @@ TESTTIMEOUT= 1200 | |||
| 999 | 999 | ||
| 1000 | 1000 | # Run a basic set of regression tests. | |
| 1001 | 1001 | # This excludes some tests that are particularly resource-intensive. | |
| 1002 | - test: all platform | ||
| 1002 | + test: @DEF_MAKE_RULE@ platform | ||
| 1003 | 1003 | $(TESTRUNNER) $(TESTOPTS) | |
| 1004 | 1004 | ||
| 1005 | 1005 | # Run the full test suite twice - once without .pyc files, and once with. | |
@@ -1009,7 +1009,7 @@ test: all platform | |||
| 1009 | 1009 | # the bytecode read from a .pyc file had the bug, sometimes the directly | |
| 1010 | 1010 | # generated bytecode. This is sometimes a very shy bug needing a lot of | |
| 1011 | 1011 | # sample data. | |
| 1012 | - testall: all platform | ||
| 1012 | + testall: @DEF_MAKE_RULE@ platform | ||
| 1013 | 1013 | -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f | |
| 1014 | 1014 | $(TESTPYTHON) -E $(srcdir)/Lib/compileall.py | |
| 1015 | 1015 | -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f | |
@@ -1018,7 +1018,7 @@ testall: all platform | |||
| 1018 | 1018 | ||
| 1019 | 1019 | # Run the test suite for both architectures in a Universal build on OSX. | |
| 1020 | 1020 | # Must be run on an Intel box. | |
| 1021 | - testuniversal: all platform | ||
| 1021 | + testuniversal: @DEF_MAKE_RULE@ platform | ||
| 1022 | 1022 | @if [ `arch` != 'i386' ]; then \ | |
| 1023 | 1023 | echo "This can only be used on OSX/i386" ;\ | |
| 1024 | 1024 | exit 1 ;\ | |
@@ -1041,7 +1041,7 @@ QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ | |||
| 1041 | 1041 | test_multiprocessing_forkserver \ | |
| 1042 | 1042 | test_mailbox test_socket test_poll \ | |
| 1043 | 1043 | test_select test_zipfile test_concurrent_futures | |
| 1044 | - quicktest: all platform | ||
| 1044 | + quicktest: @DEF_MAKE_RULE@ platform | ||
| 1045 | 1045 | $(TESTRUNNER) $(QUICKTESTOPTS) | |
| 1046 | 1046 | ||
| 1047 | 1047 | ||
@@ -1378,7 +1378,7 @@ LIBPL= @LIBPL@ | |||
| 1378 | 1378 | # pkgconfig directory | |
| 1379 | 1379 | LIBPC= $(LIBDIR)/pkgconfig | |
| 1380 | 1380 | ||
| 1381 | - libainstall: all python-config | ||
| 1381 | + libainstall: @DEF_MAKE_RULE@ python-config | ||
| 1382 | 1382 | @for i in $(LIBDIR) $(LIBPL) $(LIBPC); \ | |
| 1383 | 1383 | do \ | |
| 1384 | 1384 | if test ! -d $(DESTDIR)$$i; then \ | |
@@ -1640,7 +1640,7 @@ distclean: clobber | |||
| 1640 | 1640 | -exec rm -f {} ';' | |
| 1641 | 1641 | ||
| 1642 | 1642 | # Check for smelly exported symbols (not starting with Py/_Py) | |
| 1643 | - smelly: all | ||
| 1643 | + smelly: @DEF_MAKE_RULE@ | ||
| 1644 | 1644 | nm -p $(LIBRARY) | \ | |
| 1645 | 1645 | sed -n "/ [TDB] /s/.* //p" | grep -v "^_*Py" | sort -u; \ | |
| 1646 | 1646 | ||
@@ -1677,7 +1677,7 @@ funny: | |||
| 1677 | 1677 | -o -print | |
| 1678 | 1678 | ||
| 1679 | 1679 | # Perform some verification checks on any modified files. | |
| 1680 | - patchcheck: all | ||
| 1680 | + patchcheck: @DEF_MAKE_RULE@ | ||
| 1681 | 1681 | $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py | |
| 1682 | 1682 | ||
| 1683 | 1683 | # Dependencies | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1037,6 +1037,10 @@ Documentation | |||
| 1037 | 1037 | Build | |
| 1038 | 1038 | ----- | |
| 1039 | 1039 | ||
| 1040 | + - bpo-29243: Prevent unnecessary rebuilding of Python during ``make test``, | ||
| 1041 | + ``make install`` and some other make targets when configured with | ||
| 1042 | + ``--enable-optimizations``. | ||
| 1043 | + | ||
| 1040 | 1044 | - bpo-23404: Don't regenerate generated files based on file modification time | |
| 1041 | 1045 | anymore: the action is now explicit. Replace ``make touch`` with | |
| 1042 | 1046 | ``make regen-all``. | |
0 commit comments