From ab1455829bf9fa5b1c23cac865c27131fed3e6e0 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Tue, 7 Jun 2016 00:27:17 +0000 Subject: [PATCH] Issue #27229: Fix in-tree cross-build rule, by Xavier de Gaye --- Makefile.pre.in | 7 +++++-- Misc/NEWS | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 5aeb5027a1..dd3db0461c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -685,13 +685,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 8fb478daea..2107d09133 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -321,6 +321,9 @@ Build - 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. -- 2.50.1