diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-21 13:34:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-21 13:34:07 +0100 |
| commit | d91e5dafd5ec57d8e61f1a6ba3628a255785c25c (patch) | |
| tree | 70893f5d75f1e06cb54c064f34e7436daf6bd3e7 | |
| parent | 9166838420c2e2029270c4683f68aecd3db5a484 (diff) | |
patch 8.1.0962: building with MinGW and static libs doesn't workv8.1.0962
Problem: Building with MinGW and static libs doesn't work. (Salman Halim)
Solution: Add -lgcc. (Ken Takata)
| -rw-r--r-- | src/Make_cyg_ming.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 03953f4d61..0587b4ded0 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -932,7 +932,7 @@ ifeq (yes, $(USE_STDCPLUS)) LINK = $(CXX) ifeq (yes, $(STATIC_STDCPLUS)) #LIB += -static-libstdc++ -static-libgcc -LIB += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic +LIB += -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic endif else LINK = $(CC) diff --git a/src/version.c b/src/version.c index db9ab91f7b..59a4e029ba 100644 --- a/src/version.c +++ b/src/version.c @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 962, +/**/ 961, /**/ 960, |