Mercurial > vim

changeset 15707:be41b51f69c7 v8.1.0861

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0861: building with MinGW and static libc doesn't work commit https://github.com/vim/vim/commit/60f807b3f71a92881e2b3bf48bd016294957130e Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 31 14:43:19 2019 +0100 patch 8.1.0861: building with MinGW and static libc doesn't work Problem: Building with MinGW and static libc doesn't work. Solution: Change the LIB argument. (Ken Takata)
author Bram Moolenaar <Bram@vim.org>
date Thu, 31 Jan 2019 14:45:06 +0100
parents b33dc53cc3ff
children 8a6b91646ba7
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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,