From: Antoine Pitrou Date: Mon, 3 Jan 2011 19:11:32 +0000 (+0000) Subject: Merged revisions 84068,87558 via svnmerge from X-Git-Tag: v2.7.2rc1~408 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9828b56347f6171a532dce28c9dc5ab9bd2c8139;p=python Merged revisions 84068,87558 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84068 | martin.v.loewis | 2010-08-15 17:47:25 +0200 (dim., 15 août 2010) | 2 lines Don't run pgen twice when using make -j. ........ r87558 | victor.stinner | 2010-12-29 00:14:17 +0100 (mer., 29 déc. 2010) | 1 line Don't ignore pgen error (on "make Parser/pgen.stamp") ........ --- diff --git a/Makefile.pre.in b/Makefile.pre.in index 9bcbdab555..31e7f2e5e7 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -536,9 +536,12 @@ Modules/python.o: $(srcdir)/Modules/python.c $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c -$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) +# Use a stamp file to prevent make -j invoking pgen twice +$(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp +Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT) -@$(INSTALL) -d Include - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + -touch Parser/pgen.stamp $(PGEN): $(PGENOBJS) $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) @@ -1184,7 +1187,7 @@ profile-removal: clobber: clean profile-removal -rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \ - tags TAGS \ + tags TAGS Parser/pgen.stamp \ config.cache config.log pyconfig.h Modules/config.c -rm -rf build platform -rm -rf $(PYTHONFRAMEWORKDIR) diff --git a/Misc/NEWS b/Misc/NEWS index 22810fe5e2..a410b940b6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -105,6 +105,8 @@ Extension Modules Build ----- +- Don't run pgen twice when using make -j. + - Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in the configure script but use $GREP instead. Patch by Fabian Groffen.