Repair BSD/OS shared library fixes.

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 912c9c21c050651bd01da525363bacf6a2c4bf35..dd9a0d350fbe6cdbe4147b4f0b08656626ae8b9b 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.40 2001/02/10 16:26:38 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.41 2001/02/10 16:51:39 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -121,7 +121,8 @@ endif
 ifeq ($(PORTNAME), bsdi)
   shlib                        := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
   ifeq ($(DLSUFFIX), .so)
-    LINK.shared                = $(LD) -shared -soname $(soname)
+    LINK.shared                = $(COMPILER) -shared -Wl,-soname,$(soname)
+    SHLIB_LINK         += -lc
   endif
   ifeq ($(DLSUFFIX), .o)
     LINK.shared                = shlicc -O $(LDREL)

diff --git a/src/interfaces/odbc/GNUmakefile b/src/interfaces/odbc/GNUmakefile
index 4f2b8fc8d7cbc4329b3349c26e444c21f60b6648..488fad6c3b534a21d738bf5794d8c6b6a691cd71 100644 (file)
--- a/src/interfaces/odbc/GNUmakefile
+++ b/src/interfaces/odbc/GNUmakefile
@@ -2,7 +2,7 @@
 #
 # GNUMakefile for psqlodbc (Postgres ODBC driver)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.11 2001/02/10 15:59:16 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.12 2001/02/10 16:51:40 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -32,16 +32,8 @@ include $(top_srcdir)/src/Makefile.shlib
 # Symbols must be resolved to the version in the shared library because
 # the driver manager (e.g., iodbc) provides some symbols with the same
 # names and we don't want those.  (This issue is probably ELF specific.)
-#
-# BSD/OS fails with libc and crt1.o undefined symbols without this.
-# bjm 2001-02-09
-#
-ifneq ($(PORTNAME), bsdi)
+
 LINK.shared += $(shlib_symbolic)
-else
-LINK.shared = gcc -shared -Wl,-Bsymbolic,-soname,$(soname)
-SHLIB_LINK += -lc
-endif
 
 odbc_headers = isql.h isqlext.h iodbc.h
 odbc_includedir = $(includedir)/iodbc

diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi
index 943c179b70bf1e04f8889e1ab50e5456c50ad810..901e210fbb63ca36fb4611ea9c225bd72047687d 100644 (file)
--- a/src/makefiles/Makefile.bsdi
+++ b/src/makefiles/Makefile.bsdi
@@ -15,10 +15,10 @@ endif
 ifeq ($(DLSUFFIX), .so)
 CFLAGS_SL = -fpic
 export_dynamic = -export-dynamic
-shlib_symbolic = -Bsymbolic
+shlib_symbolic = -Wl,-Bsymbolic
 else
 CFLAGS_SL =
 endif
 
 %.so: %.o
-       $(LD) -shared -o $@ $<
+       $(CC) -shared -o $@ $<