diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2014-09-20 22:21:58 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2014-09-20 22:21:58 (GMT) |
| commit | 895ce149c1ba5a4ebd1e5b238bd7e5022fd49a20 (patch) | |
| tree | 6e64b36c3b88584594b481d952abef24c57b0c19 | |
| parent | 7c4093ca95b9aebd11dad069bcdb20f9b0ce902d (diff) | |
| download | cpython-895ce149c1ba5a4ebd1e5b238bd7e5022fd49a20.zip cpython-895ce149c1ba5a4ebd1e5b238bd7e5022fd49a20.tar.gz cpython-895ce149c1ba5a4ebd1e5b238bd7e5022fd49a20.tar.bz2 | |
Issue #22359: Remove incorrect uses of recursive make. Patch by Jonas Wagner.
| -rw-r--r-- | Makefile.pre.in | 13 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 04e4704..e5f5644 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -686,11 +686,12 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) ############################################################################ # 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 @@ Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(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 \ @@ -936,6 +936,9 @@ IDLE 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. |