[Python-checkins] cpython (merge 3.5 -> default): Issue #27229: Merge cross-compiling fix from 3.5
martin.panter
python-checkins at python.org
Mon Jun 6 20:45:37 EDT 2016
https://hg.python.org/cpython/rev/9902230b101f
changeset: 101770:9902230b101f
parent: 101768:6216fb8afa53
parent: 101769:619f7a2aa40a
user: Martin Panter <vadmium+py at gmail.com>
date: Tue Jun 07 00:30:49 2016 +0000
summary:
Issue #27229: Merge cross-compiling fix from 3.5
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
@@ -793,13 +793,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
@@ -137,6 +137,9 @@
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.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list