diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-10-21 22:45:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-10-21 22:45:43 +0200 |
| commit | eda9e9c2fe4577ad451418253b990a3f60b70444 (patch) | |
| tree | 89abc7eef82396dc93284d66871896978221c447 | |
| parent | b6f1480a6a8b1a6fa4d5da97aeb5f4755b71eb91 (diff) | |
| download | vim-git-eda9e9c2fe4577ad451418253b990a3f60b70444.tar.gz | |
patch 8.1.0490: MS-Windows: doesn't handle missing glibwinpthread-1.dllv8.1.0490
Problem: MS-Windows: doesn't handle missing glibwinpthread-1.dll.
Solution: Adjust Cygwin/MinGW build file. (Ken Takata, closes #2827)
| -rw-r--r-- | src/Make_cyg_ming.mak | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index f30fe2f70..1f62d86ee 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -121,6 +121,9 @@ endif ifndef STATIC_WINPTHREAD STATIC_WINPTHREAD=$(STATIC_STDCPLUS) endif +# If you use TDM-GCC(-64), change HAS_GCC_EH to "no". +# This is used when STATIC_STDCPLUS=yes. +HAS_GCC_EH=yes # If the user doesn't want gettext, undefine it. ifeq (no, $(GETTEXT)) @@ -928,14 +931,18 @@ DEFINES+=-DDYNAMIC_ICONV endif ifeq (yes, $(USE_STDCPLUS)) +LINK = $(CXX) ifeq (yes, $(STATIC_STDCPLUS)) -LIB += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -else -LIB += -lstdc++ +LIB += -static-libstdc++ -static-libgcc endif +else +LINK = $(CC) endif ifeq (yes, $(STATIC_WINPTHREAD)) +ifeq (yes, $(HAS_GCC_EH)) +LIB += -lgcc_eh +endif LIB += -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic endif @@ -955,7 +962,7 @@ uninstal.exe: uninstal.c $(CC) $(CFLAGS) -o uninstal.exe uninstal.c $(LIB) $(TARGET): $(OUTDIR) $(OBJ) - $(CC) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) + $(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) upx: exes upx gvim.exe @@ -1142,7 +1149,7 @@ ifneq (sh.exe, $(SHELL)) @echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' >> pathdef.c @echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' >> pathdef.c @echo 'char_u *all_cflags = (char_u *)"$(CC) $(CFLAGS)";' >> pathdef.c - @echo 'char_u *all_lflags = (char_u *)"$(CC) $(CFLAGS) $(LFLAGS) -o $(TARGET) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB)";' >> pathdef.c + @echo 'char_u *all_lflags = (char_u *)"$(LINK) $(CFLAGS) $(LFLAGS) -o $(TARGET) $(LIB) -lole32 -luuid $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB)";' >> pathdef.c @echo 'char_u *compiled_user = (char_u *)"$(USERNAME)";' >> pathdef.c @echo 'char_u *compiled_sys = (char_u *)"$(USERDOMAIN)";' >> pathdef.c else diff --git a/src/version.c b/src/version.c index 01dfc132c..a34837bb2 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 490, +/**/ 489, /**/ 488, |