diff --git a/src/build/Common.gmake b/src/build/Common.gmake
index a1dda3c42238d0297fb5564ca37d04a114fab1ac..c49f17fa5e11dc30213b518c9bb501c11ed29663 100644
--- a/src/build/Common.gmake
+++ b/src/build/Common.gmake
@@ -436,19 +436,13 @@ else
 endif
 
 SHLIBOPTS   :=  -shared
-ifeq ($(os),darwin)
- MKSHLIB        :=  libtool -dynamic -framework System -lcc_dynamic
- MKSHPPLIB      :=  libtool -dynamic -framework System -lcc_dynamic -lstdc++
- SHLIBOPTS  :=
+ifeq ($(os),sunos)
+ MKSHLIB       :=  /usr/ccs/bin/ld -G
+ MKSHPPLIB     :=  /usr/ccs/bin/ld -G
+ SHLIBOPTS :=
 else
- ifeq ($(os),sunos)
-  MKSHLIB       :=  /usr/ccs/bin/ld -G
-  MKSHPPLIB     :=  /usr/ccs/bin/ld -G
-  SHLIBOPTS :=
- else
-  MKSHLIB       :=  $(CC)
-  MKSHPPLIB     :=  $(CXX)
- endif
+ MKSHLIB       :=  $(CC)
+ MKSHPPLIB     :=  $(CXX)
 endif
 
 # Paths
diff --git a/src/conio/Common.gmake b/src/conio/Common.gmake
index 6dcd786fc2fd5396def45e9e06fe3919c00aee85..31032316023453a986fdfb694b4e71a20f3efa6d 100644
--- a/src/conio/Common.gmake
+++ b/src/conio/Common.gmake
@@ -103,7 +103,7 @@ ifdef USE_SDL
   ifeq ($(os),darwin)
    ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES)
     SDL_FRAMEWORK_PATH ?= /Library/Frameworks
-    CFLAGS += -F${SDL_FRAMEWORK_PATH} -framework SDL2
+    CFLAGS += -F${SDL_FRAMEWORK_PATH}
    endif
    ifdef SDL_FRAMEWORK_PATH
     WITH_SDL	:=	1
diff --git a/src/xpdev/Common.gmake b/src/xpdev/Common.gmake
index a1224c63e8ce5f3c6c7d2be47093b1f667a43b3b..1ce8175ab51082d20ce77406092e2a227991c784 100644
--- a/src/xpdev/Common.gmake
+++ b/src/xpdev/Common.gmake
@@ -105,7 +105,7 @@ ifdef USE_SDL_AUDIO
   ifeq ($(os),darwin)
    ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES)
     SDL_FRAMEWORK_PATH ?= /Library/Frameworks
-    CFLAGS += -F${SDL_FRAMEWORK_PATH} -framework SDL2
+    CFLAGS += -F${SDL_FRAMEWORK_PATH}
    endif
    ifdef SDL_FRAMEWORK_PATH
     WITH_SDL_AUDIO	:=	1