(original) (raw)

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)(LIBRARY) (LIBRARY)(LDLIBRARY) (PY3LIBRARY)(PY3LIBRARY) (PY3LIBRARY)(LINKCC) (PYLDFLAGS)(PY_LDFLAGS) (PYLDFLAGS)(LINKFORSHARED) -o @Modules/testembed.o@ Modules/_testembed.o @Modules/testembed.o(BLDLIBRARY) (LIBS)(LIBS) (LIBS)(MODLIBS) (SYSLIBS)(SYSLIBS) (SYSLIBS)(LDLAST) + ############################################################################ # Importlib Python/importlib.h: (srcdir)/Lib/importlib/bootstrap.py(srcdir)/Lib/importlib/_bootstrap.py (srcdir)/Lib/importlib/bootstrap.py(srcdir)/Python/freeze_importlib.py - ./$(BUILDPYTHON) (srcdir)/Python/freezeimportlib.py−(srcdir)/Python/freeze_importlib.py \ - (srcdir)/Python/freezeimportlib.py−(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h + @if test -f ./$(BUILDPYTHON); then \ + ./$(BUILDPYTHON) (srcdir)/Python/freezeimportlib.py+(srcdir)/Python/freeze_importlib.py \ + (srcdir)/Python/freezeimportlib.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 /mal@egenix.com