diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-03 19:11:48 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-03 19:11:48 (GMT) |
| commit | 57ab4411c3ec2e4459ab2fad362e78f0b82617b0 (patch) | |
| tree | 3e4dbedddeb6f78633986b87f324f748f6abbc2e | |
| parent | a75c10526f178e3b570da95454d52220e7870ea6 (diff) | |
| download | cpython-57ab4411c3ec2e4459ab2fad362e78f0b82617b0.zip cpython-57ab4411c3ec2e4459ab2fad362e78f0b82617b0.tar.gz cpython-57ab4411c3ec2e4459ab2fad362e78f0b82617b0.tar.bz2 | |
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")
........
| -rw-r--r-- | Makefile.pre.in | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 8 insertions, 3 deletions
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 @@ 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) + $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) + -touch Parser/pgen.stamp $(PGEN): $(PGENOBJS) $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) @@ -1179,7 +1182,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) @@ -167,6 +167,8 @@ Library 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). |