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 51134fe..3fc988c 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -540,9 +540,12 @@
$(IO_OBJS): $(IO_H)
-$(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)
@@ -1179,7 +1182,7 @@
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 bbedc77..96fb3cb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -167,6 +167,8 @@
Build
-----
+- Don't run pgen twice when using make -j.
+
- Backport r83399 to allow test_distutils to pass on installed versions.
- Issue #1303434: Generate ZIP file containing all PDBs (already done for rc1).