From a8428c9e3f9bf9e7ce3da7b4930402ccbc65baa9 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 9 Oct 1998 04:50:12 +0000
Subject: [PATCH] More bsdi 4.0 cleanups for shared libraries.

---
 src/interfaces/libpgtcl/Makefile.in | 4 ++--
 src/interfaces/libpq/Makefile.in    | 6 +++---
 src/makefiles/Makefile.bsdi         | 3 +--
 src/pl/plpgsql/src/Makefile.in      | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index d29e915024..cb20575940 100644
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.24 1998/10/09 04:22:46 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.25 1998/10/09 04:50:06 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -54,7 +54,7 @@ ifeq ($(PORTNAME), bsdi)
     ifeq ($(DLSUFFIX), .so)
       install-shlib-dep	:= install-shlib
       shlib		:= libpgtcl.so
-      LDFLAGS_SL	+= -O -shared
+      LDFLAGS_SL	+= -shared
       CFLAGS		+= $(CFLAGS_SL)
     endif
     ifeq ($(DLSUFFIX), .o)
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index c5c002426a..77997a849a 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.32 1998/10/09 04:22:48 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.33 1998/10/09 04:50:08 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -61,13 +61,13 @@ ifeq ($(PORTNAME), bsdi)
     ifeq ($(DLSUFFIX), .so)
       install-shlib-dep := install-shlib
       shlib		:= libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-      LDFLAGS_SL	+= -O -shared
+      LDFLAGS_SL	+= -shared
       CFLAGS		+= $(CFLAGS_SL)
     endif
     ifeq ($(DLSUFFIX), .o)
       install-shlib-dep	:= install-shlib
       shlib		:= libpq.o.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-      LD		:=shlicc
+      LD		:= shlicc
       LDFLAGS_SL 	+= -O -r
       CFLAGS		+= $(CFLAGS_SL)
     endif
diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi
index f2c54d8a79..88fe307e15 100644
--- a/src/makefiles/Makefile.bsdi
+++ b/src/makefiles/Makefile.bsdi
@@ -1,5 +1,4 @@
 # for bsdi 4.0 ELF
 # if we defined .so in template/bsdi_4.0
 %.so: %.o
-	$(CC) -shared -o $@ $<
-
+	$(LD) -shared -o $@ $<
diff --git a/src/pl/plpgsql/src/Makefile.in b/src/pl/plpgsql/src/Makefile.in
index 2ee532484c..cd8bb815d7 100644
--- a/src/pl/plpgsql/src/Makefile.in
+++ b/src/pl/plpgsql/src/Makefile.in
@@ -4,7 +4,7 @@
 #    Makefile for the plpgsql shared object
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.3 1998/10/09 04:22:49 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/Makefile.in,v 1.4 1998/10/09 04:50:12 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -43,7 +43,7 @@ endif
 ifeq ($(PORTNAME), bsdi)
   ifdef BSD_SHLIB
     ifeq ($(DLSUFFIX), .so)
-      LDFLAGS_SL	+= -O -shared
+      LDFLAGS_SL	+= -shared
       CFLAGS		+= $(CFLAGS_SL)
     endif
     ifeq ($(DLSUFFIX), .o)