[Python-checkins] cpython: Issue #22359: Remove incorrect uses of recursive make. Patch by Jonas Wagner.
antoine.pitrou
python-checkins at python.org
Sun Sep 21 00:24:14 CEST 2014
https://hg.python.org/cpython/rev/c2a53aa27cad
changeset: 92496:c2a53aa27cad
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sun Sep 21 00:21:58 2014 +0200
summary:
Issue #22359: Remove incorrect uses of recursive make. Patch by Jonas Wagner.
files:
Makefile.pre.in | 13 ++++++-------
Misc/NEWS | 3 +++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -686,11 +686,12 @@
############################################################################
# Importlib
+Programs/_freeze_importlib.o: Programs/_freeze_importlib.c
+
Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib.c
- $(MAKE) Programs/_freeze_importlib
+Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
./Programs/_freeze_importlib \
$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
@@ -752,15 +753,13 @@
$(IO_OBJS): $(IO_H)
-$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
+$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
@$(MKDIR_P) Include
- $(MAKE) $(PGEN)
$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-$(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
- $(MAKE) $(GRAMMAR_H)
+$(GRAMMAR_C): $(GRAMMAR_H)
touch $(GRAMMAR_C)
-$(PGEN): $(PGENOBJS)
+$(PGEN): $(PGENOBJS)
$(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
Parser/grammar.o: $(srcdir)/Parser/grammar.c \
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -936,6 +936,9 @@
Build
-----
+- Issue #22359: Remove incorrect uses of recursive make. Patch by Jonas
+ Wagner.
+
- Issue #21958: Define HAVE_ROUND when building with Visual Studio 2013 and
above. Patch by Zachary Turner.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list