changeset:   101770:9902230b101f
parent:      101768:6216fb8afa53
parent:      101769:619f7a2aa40a
user:        Martin Panter <vadmium+py@gmail.com>
date:        Tue Jun 07 00:30:49 2016 +0000
files:       Makefile.pre.in Misc/NEWS
description:
Issue #27229: Merge cross-compiling fix from 3.5


diff -r 6216fb8afa53 -r 9902230b101f Makefile.pre.in
--- a/Makefile.pre.in	Mon Jun 06 13:00:03 2016 +0300
+++ b/Makefile.pre.in	Tue Jun 07 00:30:49 2016 +0000
@@ -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 -r 6216fb8afa53 -r 9902230b101f Misc/NEWS
--- a/Misc/NEWS	Mon Jun 06 13:00:03 2016 +0300
+++ b/Misc/NEWS	Tue Jun 07 00:30:49 2016 +0000
@@ -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.