Mercurial > vim
changeset 10442:70680eba1940 v8.0.0115
commit https://github.com/vim/vim/commit/e3af763d5e6b90a9b5d5706920e669fd8f0b6c77
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 1 20:37:47 2016 +0100
patch 8.0.0115
Problem: When building with Cygwin libwinpthread isn't found.
Solution: Link winpthread statically. (jmmerz, closes https://github.com/vim/vim/issues/1255, closes https://github.com/vim/vim/issues/1256)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 01 Dec 2016 20:45:05 +0100 |
| parents | 8e0e4275e91e |
| children | db8b1dc897a9 |
| files | src/Make_cyg_ming.mak src/version.c |
| diffstat | 2 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -81,6 +81,13 @@ ifndef STATIC_STDCPLUS STATIC_STDCPLUS=no endif + +# Link against the shared version of libwinpthread by default. Set +# STATIC_WINPTHREAD to "yes" to link against static version instead. +ifndef STATIC_WINPTHREAD +STATIC_WINPTHREAD=$(STATIC_STDCPLUS) +endif + # If the user doesn't want gettext, undefine it. ifeq (no, $(GETTEXT)) GETTEXT= @@ -817,6 +824,10 @@ LIB += -lstdc++ endif endif +ifeq (yes, $(STATIC_WINPTHREAD)) +LIB += -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic +endif + all: $(TARGET) vimrun.exe xxd/xxd.exe install.exe uninstal.exe GvimExt/gvimext.dll vimrun.exe: vimrun.c