summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-08-15 15:47:25 +0000
committerMartin v. Löwis <martin@v.loewis.de>2010-08-15 15:47:25 +0000
commit907229af8702485817946bf82b172f6136bb6217 (patch)
tree0b828aa639980345214f269d47c7fc8762b19d57
parentd17f2197594e0c1249e020c0126e881726a4531a (diff)
downloadcpython-git-907229af8702485817946bf82b172f6136bb6217.tar.gz
Don't run pgen twice when using make -j.
-rw-r--r--Makefile.pre.in7
-rw-r--r--Misc/NEWS5
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 7dcfa797c0..3fe35c4b1d 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -561,9 +561,12 @@ Modules/python.o: $(srcdir)/Modules/python.c
$(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)
+ -touch Parser/pgen.stamp
$(PGEN): $(PGENOBJS)
$(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
@@ -1197,7 +1200,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 26a19252bd..9ad66f5e5c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -215,6 +215,11 @@ Tests
- Issue #8687: provide a test suite for sched.py module.
+Build
+-----
+
+- Don't run pgen twice when using make -j.
+
What's New in Python 3.2 Alpha 1?
=================================