Skip to content

Commit 8496c9e

Browse files
committed
patch 8.2.1981: MinGW: parallel compilation might fail
Problem: MinGW: parallel compilation might fail. Solution: Add dependencies on $(OUTDIR). (Masamichi Abe, closes #7287)
1 parent 659bb22 commit 8496c9e

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

src/Make_cyg_ming.mak

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,6 +1055,12 @@ install.exe: dosinst.c dosinst.h version.h
10551055
uninstall.exe: uninstall.c dosinst.h version.h
10561056
$(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32
10571057

1058+
$(OBJ): $(OUTDIR)
1059+
1060+
$(EXEOBJG): $(OUTDIR)
1061+
1062+
$(EXEOBJC): $(OUTDIR)
1063+
10581064
ifeq ($(VIMDLL),yes)
10591065
$(TARGET): $(OUTDIR) $(OBJ)
10601066
$(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)
12801286
$(CC) -c $(CFLAGS) $< -o $@
12811287

12821288

1283-
$(PATHDEF_SRC): Make_cyg_ming.mak Make_cyg.mak Make_ming.mak
1289+
$(PATHDEF_SRC): $(OUTDIR) Make_cyg_ming.mak Make_cyg.mak Make_ming.mak
12841290
ifneq (sh.exe, $(SHELL))
12851291
@echo creating $(PATHDEF_SRC)
12861292
@echo '/* pathdef.c */' > $(PATHDEF_SRC)

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
1981,
753755
/**/
754756
1980,
755757
/**/

0 commit comments

Comments
 (0)