diff options
| author |   Martin Panter <vadmium+py@gmail.com> | 2016-06-07 00:27:17 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-07 00:27:17 +0000 |
| commit | 9c2a8f97da41e230bcd25bf169d254ee74be2f6a (patch) | |
| tree | 59e26303fdf4966c477dcb548afaf7f873711765 | |
| parent | Issue #26014: Update 3.x packaging documentation: (diff) | |
| download | cpython-9c2a8f97da41e230bcd25bf169d254ee74be2f6a.tar.gz cpython-9c2a8f97da41e230bcd25bf169d254ee74be2f6a.tar.bz2 cpython-9c2a8f97da41e230bcd25bf169d254ee74be2f6a.zip | |
Issue #27229: Fix in-tree cross-build rule, by Xavier de Gaye
| -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 dee126395b8..eb88f5f0d81 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) diff --git a/Misc/NEWS b/Misc/NEWS index feb0c624b8a..da2dc3ec8e3 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -581,6 +581,9 @@ Build source code anyway, and is still regenerated when doing a native build. Patch by Xavier de Gaye. +- Issue #27229: Fix the cross-compiling pgen rule for in-tree builds. Patch + by Xavier de Gaye. + - Issue #21668: Link audioop, _datetime, _ctypes_test modules to libm, except on Mac OS X. Patch written by Xavier de Gaye. |