diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-31 14:43:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-31 14:43:19 +0100 |
| commit | 60f807b3f71a92881e2b3bf48bd016294957130e (patch) | |
| tree | c94c7d0771b947e0ea60cb06d56c8b1e5a1f4326 | |
| parent | 77255cab7447792d781752707c8e163c838ec996 (diff) | |
patch 8.1.0861: building with MinGW and static libc doesn't workv8.1.0861
Problem: Building with MinGW and static libc doesn't work.
Solution: Change the LIB argument. (Ken Takata)
| -rw-r--r-- | src/Make_cyg_ming.mak | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 5795b50752..1e26adda5d 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -931,7 +931,8 @@ endif ifeq (yes, $(USE_STDCPLUS)) LINK = $(CXX) ifeq (yes, $(STATIC_STDCPLUS)) -LIB += -static-libstdc++ -static-libgcc +#LIB += -static-libstdc++ -static-libgcc +LIB += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic endif else LINK = $(CC) diff --git a/src/version.c b/src/version.c index 3478fd5764..6470c46705 100644 --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 861, +/**/ 860, /**/ 859, |