Add '-Wl,' prefix to linker switches consistently. Remove shlib_symbolic

macros, which aren't used anywhere and haven't been for some time.

diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi
index 0257f6367a46128245dfbf23f3db647fa8d82386..a9d709d13708f9c707dd76ea50c575866ba8a906 100644 (file)
--- a/src/makefiles/Makefile.bsdi
+++ b/src/makefiles/Makefile.bsdi
@@ -15,8 +15,7 @@ endif
 ifeq ($(DLSUFFIX), .so)
 CFLAGS_SL = -fpic
 rpath = -Wl,-rpath,$(rpathdir)
-export_dynamic = -export-dynamic
-shlib_symbolic = -Wl,-Bsymbolic
+export_dynamic = -Wl,-export-dynamic
 else
 CFLAGS_SL =
 endif

diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index 8f41ea4d867ed4cf2debaee3e5bd549d155a858e..e5a489e2a8b4bbc29d89935619b40814dd092d93 100644 (file)
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -1,9 +1,8 @@
 AROPT = cr
 
 ifdef ELF_SYSTEM
-export_dynamic = -export-dynamic
-rpath = -R$(rpathdir)
-shlib_symbolic = -Wl,-Bsymbolic -lc
+export_dynamic = -Wl,-export-dynamic
+rpath = -Wl,-R$(rpathdir)
 endif
 
 DLSUFFIX = .so

diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux
index f8be012b9fa53bd21cbeda7942135eb6f9cb5742..dc2e3406f62d7c32fffa9386cd8262a0b9947119 100644 (file)
--- a/src/makefiles/Makefile.hpux
+++ b/src/makefiles/Makefile.hpux
@@ -33,7 +33,6 @@ endif
 
 # set up appropriate options for shared library builds
 export_dynamic = -Wl,-E
-shlib_symbolic = -Bsymbolic
 
 INSTALL_SHLIB_OPTS = -m 555
 

diff --git a/src/makefiles/Makefile.irix b/src/makefiles/Makefile.irix
index 4486ed05e09d57481052442edbfd22bedd7d0b2f..162982b6acf2e9f505ab031a5be1eede91c3bbd1 100644 (file)
--- a/src/makefiles/Makefile.irix
+++ b/src/makefiles/Makefile.irix
@@ -1,7 +1,6 @@
 MK_NO_LORDER= true
 AROPT = crs
 rpath = -Wl,-rpath,$(rpathdir)
-shlib_symbolic = -Wl,-B,symbolic
 
 DLSUFFIX = .so
 # PIC is default

diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index c473214466e2aa6c459d79955f52f80c65e7a154..6dd9c6ebbb78075ce8b1d2e49b7bd52195d90e94 100644 (file)
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -1,7 +1,6 @@
 AROPT = crs
 export_dynamic = -Wl,-E
 rpath = -Wl,-rpath,$(rpathdir)
-shlib_symbolic = -Wl,-Bsymbolic
 allow_nonpic_in_shlib = yes
 DLSUFFIX = .so
 

diff --git a/src/makefiles/Makefile.netbsd b/src/makefiles/Makefile.netbsd
index 2b6a1e13fd25560f1df6b3a49f47bdb2aa0507cb..b40ed8826e7f2c6d971ffc3b66f60c7c6322f71e 100644 (file)
--- a/src/makefiles/Makefile.netbsd
+++ b/src/makefiles/Makefile.netbsd
@@ -3,9 +3,8 @@ AROPT = cr
 ifdef ELF_SYSTEM
 export_dynamic = -Wl,-E
 rpath = -Wl,-R$(rpathdir)
-shlib_symbolic = -Wl,-Bsymbolic -lc
 else
-rpath = -R$(rpathdir)
+rpath = -Wl,-R$(rpathdir)
 endif
 
 DLSUFFIX = .so

diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd
index e35739573cdba6080611899b52bb4fdfb49f583a..3308834c05366e5c9efd6d67ecd76caf2ed24bcf 100644 (file)
--- a/src/makefiles/Makefile.openbsd
+++ b/src/makefiles/Makefile.openbsd
@@ -2,8 +2,7 @@ AROPT = cr
 
 ifdef ELF_SYSTEM
 export_dynamic = -Wl,-E
-rpath = -R$(rpathdir)
-shlib_symbolic = -Wl,-Bsymbolic
+rpath = -Wl,-R$(rpathdir)
 endif
 
 DLSUFFIX = .so

diff --git a/src/makefiles/Makefile.osf b/src/makefiles/Makefile.osf
index ebd6c30149bcd8c51640fcdd6deca29c896af131..912134ea9a51b734fe470b78c53b0e5b0c32ab43 100644 (file)
--- a/src/makefiles/Makefile.osf
+++ b/src/makefiles/Makefile.osf
@@ -1,7 +1,7 @@
 AROPT = crs
 DLSUFFIX = .so
 CFLAGS_SL =
-rpath = -rpath $(rpathdir)
+rpath = -Wl,-rpath -Wl,$(rpathdir)
 
 %.so: %.o
        $(LD) -shared -expect_unresolved '*' -o $@ $<

diff --git a/src/makefiles/Makefile.sco b/src/makefiles/Makefile.sco
index 0d8a7c8b231583cd4f0a6edd7b524a40b5d7b3d9..05ed940ee323cfe96eebbccc9af442380f959e61 100644 (file)
--- a/src/makefiles/Makefile.sco
+++ b/src/makefiles/Makefile.sco
@@ -1,6 +1,5 @@
 AROPT = cr
 export_dynamic = -Wl,-Bexport
-shlib_symbolic = -Wl,-Bsymbolic
 
 DLSUFFIX = .so
 ifeq ($(GCC), yes)

diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
index 2ff7e28c90756a65c4d38d1276fe831ff73b9942..534bf40d092f651fa053bc7c714082f4ba27f75c 100644 (file)
--- a/src/makefiles/Makefile.solaris
+++ b/src/makefiles/Makefile.solaris
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.11 2004/11/19 00:41:39 tgl Exp $
+# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.12 2004/12/21 18:47:42 tgl Exp $
 
 AROPT = crs
 
@@ -6,9 +6,8 @@ ifeq ($(with_gnu_ld), yes)
 export_dynamic = -Wl,-E
 rpath = -Wl,-rpath,$(rpathdir)
 else
-rpath = -R$(rpathdir)
+rpath = -Wl,-R$(rpathdir)
 endif
-shlib_symbolic = -Wl,-Bsymbolic
 
 DLSUFFIX = .so
 ifeq ($(GCC), yes)

diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index 7120601f68303742e1cc83332bf1de681b3175c5..cf446e1c0c906081608e3841eeec2621a15eb4d9 100644 (file)
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -12,7 +12,6 @@ else
        rpath = -Wl,-R$(rpathdir)
 endif
 endif
-shlib_symbolic = -Wl,-Bsymbolic
 
 DLSUFFIX = .so
 ifeq ($(GCC), yes)