Mercurial > vim
changeset 4137:4936ee89b4bc v7.3.821
updated for version 7.3.821
Problem: Build with OLE and Cygwin is broken. (Steve Hall)
Solution: Select static or shared stdc library. (Ken Takta)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Sat, 16 Feb 2013 18:16:15 +0100 |
parents | c6107b4575a4 |
children | 84cc49b2da4f |
files | src/Make_cyg.mak src/version.c |
diffstat | 2 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_cyg.mak +++ b/src/Make_cyg.mak @@ -106,6 +106,13 @@ ifndef OPTIMIZE OPTIMIZE = MAXSPEED endif + +# Link against the shared version of libstdc++ by default. Set +# STATIC_STDCPLUS to "yes" to link against static version instead. +ifndef STATIC_STDCPLUS +STATIC_STDCPLUS=no +endif + ### See feature.h for a list of optionals. ### Any other defines can be included here. @@ -478,7 +485,12 @@ endif ifeq (yes, $(OLE)) DEFINES += -DFEAT_OLE EXTRA_OBJS += $(OUTDIR)/if_ole.o -EXTRA_LIBS += -loleaut32 -lstdc++ +EXTRA_LIBS += -loleaut32 +ifeq (yes, $(STATIC_STDCPLUS)) +EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -lsupc++ -Wl,-Bdynamic +else +EXTRA_LIBS += -lstdc++ +endif endif ##############################