To: vim_dev@googlegroups.com Subject: Patch 8.2.1981 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1981 Problem: MinGW: parallel compilation might fail. Solution: Add dependencies on $(OUTDIR). (Masamichi Abe, closes #7287) Files: src/Make_cyg_ming.mak *** ../vim-8.2.1980/src/Make_cyg_ming.mak 2020-09-05 15:48:32.465546702 +0200 --- src/Make_cyg_ming.mak 2020-11-13 17:45:15.130070462 +0100 *************** *** 1055,1060 **** --- 1055,1066 ---- uninstall.exe: uninstall.c dosinst.h version.h $(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32 + $(OBJ): $(OUTDIR) + + $(EXEOBJG): $(OUTDIR) + + $(EXEOBJC): $(OUTDIR) + ifeq ($(VIMDLL),yes) $(TARGET): $(OUTDIR) $(OBJ) $(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid -lgdi32 $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) *************** *** 1280,1286 **** $(CC) -c $(CFLAGS) $< -o $@ ! $(PATHDEF_SRC): Make_cyg_ming.mak Make_cyg.mak Make_ming.mak ifneq (sh.exe, $(SHELL)) @echo creating $(PATHDEF_SRC) @echo '/* pathdef.c */' > $(PATHDEF_SRC) --- 1286,1292 ---- $(CC) -c $(CFLAGS) $< -o $@ ! $(PATHDEF_SRC): $(OUTDIR) Make_cyg_ming.mak Make_cyg.mak Make_ming.mak ifneq (sh.exe, $(SHELL)) @echo creating $(PATHDEF_SRC) @echo '/* pathdef.c */' > $(PATHDEF_SRC) *** ../vim-8.2.1980/src/version.c 2020-11-12 20:16:35.703302822 +0100 --- src/version.c 2020-11-13 17:46:25.549915741 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 1981, /**/ -- "Marriage is a wonderful institution... but who wants to live in an institution?" - Groucho Marx /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///