diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-06-07 00:30:49 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-07 00:30:49 (GMT) |
| commit | bb707607ea116dbbc113c144a7afbda54824ad83 (patch) | |
| tree | 931e3652da2ef0dce1962049162e79360b8ce836 | |
| parent | 6db1f6f7aef964efa75d669c30e96766e145b06c (diff) | |
| parent | 9c2a8f97da41e230bcd25bf169d254ee74be2f6a (diff) | |
| download | cpython-bb707607ea116dbbc113c144a7afbda54824ad83.zip cpython-bb707607ea116dbbc113c144a7afbda54824ad83.tar.gz cpython-bb707607ea116dbbc113c144a7afbda54824ad83.tar.bz2 | |
Issue #27229: Merge cross-compiling fix from 3.5
| -rw-r--r-- | Makefile.pre.in | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 4071a2a..64bfc1c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -793,13 +793,16 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) if test "$(cross_compiling)" != "yes"; then \ $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \ else \ - cp $(srcdir)/Include/graminit.h $(GRAMMAR_H); \ + # Avoid copying the file onto itself for an in-tree build \ + cp $(srcdir)/Include/graminit.h $(GRAMMAR_H).tmp; \ + mv $(GRAMMAR_H).tmp $(GRAMMAR_H); \ fi $(GRAMMAR_C): $(GRAMMAR_H) if test "$(cross_compiling)" != "yes"; then \ touch $(GRAMMAR_C); \ else \ - cp $(srcdir)/Python/graminit.c $(GRAMMAR_C); \ + cp $(srcdir)/Python/graminit.c $(GRAMMAR_C).tmp; \ + mv $(GRAMMAR_C).tmp $(GRAMMAR_C); \ fi $(PGEN): $(PGENOBJS) @@ -137,6 +137,9 @@ Windows Build ----- +- Issue #27229: Fix the cross-compiling pgen rule for in-tree builds. Patch + by Xavier de Gaye. + - Issue #26930: Update OS X 10.5+ 32-bit-only installer to build and link with OpenSSL 1.0.2h. |