File tree Expand file tree Collapse file tree 2 files changed +15
-1
lines changed
Expand file tree Collapse file tree 2 files changed +15
-1
lines changed Original file line number Diff line number Diff line change @@ -106,6 +106,13 @@ ifndef OPTIMIZE
106106OPTIMIZE = MAXSPEED
107107endif
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
478485ifeq (yes, $(OLE ) )
479486DEFINES += -DFEAT_OLE
480487EXTRA_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
482494endif
483495
484496# #############################
Original file line number Diff line number Diff line change @@ -725,6 +725,8 @@ static char *(features[]) =
725725
726726static int included_patches [] =
727727{ /* Add new patch number below this line */
728+ /**/
729+ 821 ,
728730/**/
729731 820 ,
730732/**/
You can’t perform that action at this time.
0 commit comments