diff --git a/make/defs.mk b/make/defs.mk
index 43c675d7..99fdb4ce 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -79,10 +79,12 @@ STRIP                  = $(CROSS_TOOL_BIN_PREFIX)strip
 LDFLAGS               += -lws2_32
 USE_GFILTER            = false
 MS_LD                 ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
+LD                     = $(GPP)
 else
 GCC                    = gcc
 GPP                    = g++
 STRIP                  = strip
+LD                     = $(GPP)
 endif
 
 YTOOLS_DIR             = $(MODDIR)
@@ -468,6 +470,7 @@ endif
 
 ifeq ($(USE_EXCEPTIONS_IN_C),true)
 	CFLAGS      += -fexceptions
+	LDFLAGS     += -shared-libgcc
 endif
 
 ifeq ($(STRIP_SYMBOLS),true)