Skip to content

Commit e3af763

Browse files
committed
patch 8.0.0115
Problem: When building with Cygwin libwinpthread isn't found. Solution: Link winpthread statically. (jmmerz, closes #1255, closes #1256)
1 parent b04a98f commit e3af763

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

src/Make_cyg_ming.mak

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ ifndef STATIC_STDCPLUS
8181
STATIC_STDCPLUS=no
8282
endif
8383

84+
85+
# Link against the shared version of libwinpthread by default. Set
86+
# STATIC_WINPTHREAD to "yes" to link against static version instead.
87+
ifndef STATIC_WINPTHREAD
88+
STATIC_WINPTHREAD=$(STATIC_STDCPLUS)
89+
endif
90+
8491
# If the user doesn't want gettext, undefine it.
8592
ifeq (no, $(GETTEXT))
8693
GETTEXT=
@@ -817,6 +824,10 @@ LIB += -lstdc++
817824
endif
818825
endif
819826

827+
ifeq (yes, $(STATIC_WINPTHREAD))
828+
LIB += -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic
829+
endif
830+
820831
all: $(TARGET) vimrun.exe xxd/xxd.exe install.exe uninstal.exe GvimExt/gvimext.dll
821832

822833
vimrun.exe: vimrun.c

src/version.c

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

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
115,
767769
/**/
768770
114,
769771
/**/

0 commit comments

Comments
 (0)