Revert shlib changes.

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index e8aee43b19fdc0943ad73ec52469da1291f86ffd..912c9c21c050651bd01da525363bacf6a2c4bf35 100644 (file)
--- 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.39 2001/02/10 16:25:10 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.40 2001/02/10 16:26:38 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -112,7 +112,7 @@ endif
 ifeq ($(PORTNAME), openbsd)
   shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   ifdef ELF_SYSTEM
-    LINK.shared                = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
+    LINK.shared                = $(LD) -x -Bshareable -soname $(soname)
   else
     LINK.shared                = $(LD) -x -Bshareable -Bforcearchive
   endif
@@ -121,7 +121,7 @@ endif
 ifeq ($(PORTNAME), bsdi)
   shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   ifeq ($(DLSUFFIX), .so)
-    LINK.shared                = $(COMPILER) -shared -Wl,-soname,$(soname)
+    LINK.shared                = $(LD) -shared -soname $(soname)
   endif
   ifeq ($(DLSUFFIX), .o)
     LINK.shared                = shlicc -O $(LDREL)
@@ -131,7 +131,7 @@ endif
 ifeq ($(PORTNAME), freebsd)
   ifdef ELF_SYSTEM
     shlib              := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-    LINK.shared                = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
+    LINK.shared                = $(LD) -x -shared -soname $(soname)
   else
     shlib              := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
     LINK.shared                = $(LD) -x -Bshareable -Bforcearchive
@@ -165,12 +165,13 @@ endif
 
 ifeq ($(PORTNAME), solaris)
   shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+  LINK.shared          = $(COMPILER) -G
   ifeq ($(with_gnu_ld), yes)
-    LINK.shared                = $(COMPILER) -G -Wl,-soname,$(soname)
+    LINK.shared                += -Wl,-soname,$(soname)
   else
-    LINK.shared                = $(COMPILER) -G -Wl,-h,$(soname)
+    LINK.shared                += -Wl,-h,$(soname)
   endif
-  SHLIB_LINK           = $(COMPILER) -G -lm -lc
+  SHLIB_LINK           += -lm -lc
 endif
 
 ifeq ($(PORTNAME), osf)