diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-13 17:47:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-13 17:47:33 +0100 |
| commit | 8496c9eadbf4ea3bf69e2e01456831eee2bddf0a (patch) | |
| tree | 53e10b433d044af8e7bee24edb258a9641ff1310 | |
| parent | 659bb2275e1c407709e2ac949044d6b256de5550 (diff) | |
patch 8.2.1981: MinGW: parallel compilation might failv8.2.1981
Problem: MinGW: parallel compilation might fail.
Solution: Add dependencies on $(OUTDIR). (Masamichi Abe, closes #7287)
| -rw-r--r-- | src/Make_cyg_ming.mak | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 75021cc374..498f34e1f0 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -1055,6 +1055,12 @@ install.exe: dosinst.c dosinst.h version.h 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 @@ $(OUTDIR)/%.o : xdiff/%.c $(XDIFF_DEPS) $(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) diff --git a/src/version.c b/src/version.c index d1e174d340..3dde5b22a8 100644 --- 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, |