Mercurial > vim
comparison src/Make_cyg_ming.mak @ 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 | 2cc0de1e05a6 |
children | a852e4e61887 |
comparison
equal
deleted
inserted
replaced
22867:ed4a1aad0a9f | 22868:f3cbb41b6370 |
---|---|
1053 $(CC) $(CFLAGS) -o install.exe dosinst.c $(LIB) -lole32 -luuid | 1053 $(CC) $(CFLAGS) -o install.exe dosinst.c $(LIB) -lole32 -luuid |
1054 | 1054 |
1055 uninstall.exe: uninstall.c dosinst.h version.h | 1055 uninstall.exe: uninstall.c dosinst.h version.h |
1056 $(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32 | 1056 $(CC) $(CFLAGS) -o uninstall.exe uninstall.c $(LIB) -lole32 |
1057 | 1057 |
1058 $(OBJ): $(OUTDIR) | |
1059 | |
1060 $(EXEOBJG): $(OUTDIR) | |
1061 | |
1062 $(EXEOBJC): $(OUTDIR) | |
1063 | |
1058 ifeq ($(VIMDLL),yes) | 1064 ifeq ($(VIMDLL),yes) |
1059 $(TARGET): $(OUTDIR) $(OBJ) | 1065 $(TARGET): $(OUTDIR) $(OBJ) |
1060 $(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid -lgdi32 $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) | 1066 $(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid -lgdi32 $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) |
1061 | 1067 |
1062 $(GVIMEXE): $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll | 1068 $(GVIMEXE): $(OUTDIR) $(EXEOBJG) $(VIMDLLBASE).dll |
1278 | 1284 |
1279 $(OUTDIR)/%.o : xdiff/%.c $(XDIFF_DEPS) | 1285 $(OUTDIR)/%.o : xdiff/%.c $(XDIFF_DEPS) |
1280 $(CC) -c $(CFLAGS) $< -o $@ | 1286 $(CC) -c $(CFLAGS) $< -o $@ |
1281 | 1287 |
1282 | 1288 |
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 |
1284 ifneq (sh.exe, $(SHELL)) | 1290 ifneq (sh.exe, $(SHELL)) |
1285 @echo creating $(PATHDEF_SRC) | 1291 @echo creating $(PATHDEF_SRC) |
1286 @echo '/* pathdef.c */' > $(PATHDEF_SRC) | 1292 @echo '/* pathdef.c */' > $(PATHDEF_SRC) |
1287 @echo '#include "vim.h"' >> $(PATHDEF_SRC) | 1293 @echo '#include "vim.h"' >> $(PATHDEF_SRC) |
1288 @echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' >> $(PATHDEF_SRC) | 1294 @echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' >> $(PATHDEF_SRC) |