summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-06-07 01:08:48 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-06-07 01:08:48 (GMT)
commitcb3a581636135556429b2036663e91c043c2bfd8 (patch)
tree56d14c97d67518de5618db8335deaf02cbafac40
parentbb707607ea116dbbc113c144a7afbda54824ad83 (diff)
parent6827fd867b9609c405cd25568aa91df1b0d011b4 (diff)
downloadcpython-cb3a581636135556429b2036663e91c043c2bfd8.zip
cpython-cb3a581636135556429b2036663e91c043c2bfd8.tar.gz
cpython-cb3a581636135556429b2036663e91c043c2bfd8.tar.bz2
Issue #27229: Merge makefile fix from 3.5
-rw-r--r--Makefile.pre.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 64bfc1c..870c0e7 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -790,10 +790,10 @@ $(IO_OBJS): $(IO_H)
$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
@$(MKDIR_P) Include
+ # Avoid copying the file onto itself for an in-tree build
if test "$(cross_compiling)" != "yes"; then \
$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C); \
else \
- # 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