changeset: 76558:5fea362b92fc
parent: 76556:4e9f1017355f
user: Marc-Andre Lemburg <mal@egenix.com>
date: Wed Apr 25 19:45:11 2012 +0200
files: Makefile.pre.in
description:
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.
diff -r 4e9f1017355f -r 5fea362b92fc Makefile.pre.in
--- a/Makefile.pre.in	Wed Apr 25 08:12:37 2012 -0500
+++ b/Makefile.pre.in	Wed Apr 25 19:45:11 2012 +0200
@@ -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
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/5fea362b92fc">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/5fea362b92fc" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>