Skip to content

Commit 766621e

Browse files
committed
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)
1 parent d9a4318 commit 766621e

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/Make_cyg.mak

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,13 @@ ifndef OPTIMIZE
106106
OPTIMIZE = MAXSPEED
107107
endif
108108

109+
110+
# Link against the shared version of libstdc++ by default. Set
111+
# STATIC_STDCPLUS to "yes" to link against static version instead.
112+
ifndef STATIC_STDCPLUS
113+
STATIC_STDCPLUS=no
114+
endif
115+
109116
### See feature.h for a list of optionals.
110117
### Any other defines can be included here.
111118

@@ -478,7 +485,12 @@ endif
478485
ifeq (yes, $(OLE))
479486
DEFINES += -DFEAT_OLE
480487
EXTRA_OBJS += $(OUTDIR)/if_ole.o
481-
EXTRA_LIBS += -loleaut32 -lstdc++
488+
EXTRA_LIBS += -loleaut32
489+
ifeq (yes, $(STATIC_STDCPLUS))
490+
EXTRA_LIBS += -Wl,-Bstatic -lstdc++ -lsupc++ -Wl,-Bdynamic
491+
else
492+
EXTRA_LIBS += -lstdc++
493+
endif
482494
endif
483495

484496
##############################

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,8 @@ static char *(features[]) =
725725

726726
static int included_patches[] =
727727
{ /* Add new patch number below this line */
728+
/**/
729+
821,
728730
/**/
729731
820,
730732
/**/

0 commit comments

Comments
 (0)