[3.6] bpo-31934: Abort when building out of a not clean source tree (GH-4255). (...

(cherry picked from commit 0de92859caf25e65fc968d4bb68626e9ba21b851)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 6a0118f787142026ef591b51a07fcdf8ae7adf84..2b647a8e5885f9c37c01d36857409e3ca196388d 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -440,7 +440,17 @@ DTRACE_DEPS = \
 
 # Default target
 all:           @DEF_MAKE_ALL_RULE@
-build_all:     $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks Programs/_testembed python-config
+build_all:     check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks \
+               Programs/_testembed python-config
+
+# Check that the source is clean when building out of source.
+check-clean-src:
+       @if test -n "$(VPATH)" -a -f "$(srcdir)/Programs/python.o"; then \
+               echo "Error: The source directory ($(srcdir)) is not clean" ; \
+               echo "Building Python out of the source tree (in $(abs_builddir)) requires a clean source tree ($(abs_srcdir))" ; \
+               echo "Try to run: make -C \"$(srcdir)\" clean" ; \
+               exit 1; \
+       fi
 
 # Compile a binary with profile guided optimization.
 profile-opt:
@@ -530,7 +540,7 @@ coverage-report: regen-grammar regen-importlib
 # Run "Argument Clinic" over all source files
 # (depends on python having already been built)
 .PHONY=clinic
-clinic: $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2s_impl.c
+clinic: check-clean-src $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2s_impl.c
        $(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
 
 # Build the interpreter
@@ -1091,7 +1101,7 @@ altinstall: commoninstall
                        $$ensurepip --root=$(DESTDIR)/ ; \
        fi
 
-commoninstall:  @FRAMEWORKALTINSTALLFIRST@ \
+commoninstall:  check-clean-src @FRAMEWORKALTINSTALLFIRST@ \
                altbininstall libinstall inclinstall libainstall \
                sharedinstall oldsharedinstall altmaninstall \
                @FRAMEWORKALTINSTALLLAST@
@@ -1714,7 +1724,7 @@ patchcheck: @DEF_MAKE_RULE@
 Python/thread.o: @THREADHEADERS@
 
 # Declare targets that aren't real files
-.PHONY: all build_all sharedmods oldsharedmods test quicktest
+.PHONY: all build_all sharedmods check-clean-src oldsharedmods test quicktest
 .PHONY: install altinstall oldsharedinstall bininstall altbininstall
 .PHONY: maninstall libinstall inclinstall libainstall sharedinstall
 .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure

diff --git a/Misc/NEWS.d/next/Build/2017-11-03-15-17-50.bpo-31934.8bUlpv.rst b/Misc/NEWS.d/next/Build/2017-11-03-15-17-50.bpo-31934.8bUlpv.rst
new file mode 100644 (file)
index 0000000..deaa740
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2017-11-03-15-17-50.bpo-31934.8bUlpv.rst
@@ -0,0 +1 @@
+Abort the build when building out of a not clean source tree.