diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 186575814d..0635049d06 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -6,7 +6,7 @@
 # Copyright (c) 1998, Regents of the University of California
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.52 2001/06/20 20:25:11 petere Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.53 2001/09/11 23:20:41 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -174,13 +174,24 @@ endif
 
 ifeq ($(PORTNAME), solaris)
   shlib			:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-  LINK.shared		= $(COMPILER) -G
+  ifndef cplusplus
+    ifeq ($(GCC), yes)
+      LINK.shared	= $(CC) -shared
+    else
+      LINK.shared	= $(CC) -G
+    endif
+  else
+    ifeq ($(GXX), yes)
+      LINK.shared	= $(CXX) -shared
+    else
+      LINK.shared	= $(CXX) -G
+    endif
+  endif
   ifeq ($(with_gnu_ld), yes)
     LINK.shared		+= -Wl,-soname,$(soname)
   else
     LINK.shared		+= -Wl,-h,$(soname)
   endif
-  SHLIB_LINK		+= -lm -lc
 endif
 
 ifeq ($(PORTNAME), sunos4)