[Python-checkins] cpython (2.7): Issue #27229: Fix in-tree cross-build rule, by Xavier de Gaye
martin.panter
python-checkins at python.org
Mon Jun 6 20:45:37 EDT 2016
https://hg.python.org/cpython/rev/ffed402528c7
changeset: 101771:ffed402528c7
branch: 2.7
parent: 101757:71fc5b246f5b
user: Martin Panter <vadmium+py at gmail.com>
date: Tue Jun 07 00:27:17 2016 +0000
summary:
Issue #27229: Fix in-tree cross-build rule, by Xavier de Gaye
files:
Makefile.pre.in | 7 +++++--
Misc/NEWS | 3 +++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -685,13 +685,16 @@
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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -321,6 +321,9 @@
- Issue #19450: Update Windows builds to use SQLite 3.8.11.0.
+- Issue #27229: Fix the cross-compiling pgen rule for in-tree builds. Patch
+ by Xavier de Gaye.
+
- Issue #17603: Avoid error about nonexistant fileblocks.o file by using a
lower-level check for st_blocks in struct stat.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list