[Python-checkins] cpython: Issue #14605 and #14642: Issue a warning in case Python\importlib.h needs to

[marc-andre.lemburg]

http://hg.python.org/cpython/rev/5fea362b92fc
changeset:   76558:5fea362b92fc
parent:      76556:4e9f1017355f
user:        Marc-Andre Lemburg <mal at egenix.com>
date:        Wed Apr 25 19:45:11 2012 +0200
summary:
  Issue #14605 and #14642: Issue a warning in case Python\importlib.h needs to
be rebuilt, but there's no Python interpreter around to freeze the bootstrap
script.

Forgot to include Makefile.pre.in in changeset 76549:acfdf46b8de1.

files:
  Makefile.pre.in |  15 +++++++++++++--
  1 files changed, 13 insertions(+), 2 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -573,12 +573,23 @@
 
 Modules/_testembed: Modules/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+
 ############################################################################
 # Importlib
 
 Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py $(srcdir)/Python/freeze_importlib.py
-	./$(BUILDPYTHON) $(srcdir)/Python/freeze_importlib.py \
-	    $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
+	@if test -f ./$(BUILDPYTHON); then \
+	    ./$(BUILDPYTHON) $(srcdir)/Python/freeze_importlib.py \
+		$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h; \
+	else \
+	    echo "----------------------------------------------------------"; \
+	    echo "Python/importlib.h needs to be rebuilt, but no interpreter"; \
+	    echo "is available to do so. Leaving the previous version in"; \
+	    echo "place. You may want to run ''make'' a second time after"; \
+	    echo "this build is complete."; \
+	    echo "----------------------------------------------------------"; \
+	fi
+
 ############################################################################
 # Special rules for object files
 

-- 
Repository URL: http://hg.python.org/cpython