From 5004e8846e3e7ab3888b57746c4d84719c70ccf4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 16 Feb 2013 18:16:15 +0100
Subject: 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)

---
 src/Make_cyg.mak | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/Make_cyg.mak')

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index 0930161d47..7ba2f9dbf6 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
 
 ##############################
-- 
cgit v1.2.3