summaryrefslogtreecommitdiff
path: root/src/Make_cyg.mak
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-02-16 18:16:15 +0100
committerBram Moolenaar <Bram@vim.org>2013-02-16 18:16:15 +0100
commit5004e8846e3e7ab3888b57746c4d84719c70ccf4 (patch)
tree12eb698632aa09d62e4f70e4f7edd5121097c48f /src/Make_cyg.mak
parentfeeaa688ebfd95281529191718b9194187995f7f (diff)
downloadvim-git-5004e8846e3e7ab3888b57746c4d84719c70ccf4.tar.gz
updated for version 7.3.821v7.3.821
Problem: Build with OLE and Cygwin is broken. (Steve Hall) Solution: Select static or shared stdc library. (Ken Takta)
Diffstat (limited to 'src/Make_cyg.mak')
-rw-r--r--src/Make_cyg.mak14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index 0930161d4..7ba2f9dbf 100644
--- 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
##############################