changeset 22868:f3cbb41b6370 v8.2.1981

patch 8.2.1981: MinGW: parallel compilation might fail Commit: https://github.com/vim/vim/commit/8496c9eadbf4ea3bf69e2e01456831eee2bddf0a Author: Bram Moolenaar <Bram@vim.org> Date: Fri Nov 13 17:47:33 2020 +0100 patch 8.2.1981: MinGW: parallel compilation might fail Problem: MinGW: parallel compilation might fail. Solution: Add dependencies on $(OUTDIR). (Masamichi Abe, closes https://github.com/vim/vim/issues/7287)
author Bram Moolenaar <Bram@vim.org>
date Fri, 13 Nov 2020 18:00:05 +0100
parents ed4a1aad0a9f
children 6996926dd538
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -1055,6 +1055,12 @@ install.exe: dosinst.c dosinst.h version
 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,7 +1286,7 @@ CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/
 	$(CC) -c $(CFLAGS) $< -o $@
 
 
-$(PATHDEF_SRC): Make_cyg_ming.mak Make_cyg.mak Make_ming.mak
+$(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)
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1981,
+/**/
     1980,
 /**/
     1979,