diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-02-10 17:17:39 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-02-10 17:17:39 +0000 |
| commit | 00ab7b58969204c192636872ff3a6174b450e73c (patch) | |
| tree | f7ac63f4abf472ae29d8f3124f527c724dcd644c | |
| parent | 8213e63d8cd9acbbfa8a13adeb1a88c4738c2b75 (diff) | |
| download | postgresql-00ab7b58969204c192636872ff3a6174b450e73c.tar.gz postgresql-00ab7b58969204c192636872ff3a6174b450e73c.zip | |
Fix -Bsymbolic for FreeBSD and OpenBSD. NetBSD already had all these fixes.
| -rw-r--r-- | src/Makefile.shlib | 12 | ||||
| -rw-r--r-- | src/makefiles/Makefile.freebsd | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.openbsd | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index dd9a0d350fb..b8d25927b96 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.41 2001/02/10 16:51:39 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.42 2001/02/10 17:17:39 momjian Exp $ # #------------------------------------------------------------------------- @@ -112,7 +112,8 @@ endif ifeq ($(PORTNAME), openbsd) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) ifdef ELF_SYSTEM - LINK.shared = $(LD) -x -Bshareable -soname $(soname) + LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) + SHLIB_LINK += -lc else LINK.shared = $(LD) -x -Bshareable -Bforcearchive endif @@ -121,7 +122,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 = $(COMPILER) -shared -Wl,-x,-soname,$(soname) SHLIB_LINK += -lc endif ifeq ($(DLSUFFIX), .o) @@ -132,7 +133,8 @@ endif ifeq ($(PORTNAME), freebsd) ifdef ELF_SYSTEM shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) - LINK.shared = $(LD) -x -shared -soname $(soname) + LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) + SHLIB_LINK += -lc else shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) LINK.shared = $(LD) -x -Bshareable -Bforcearchive @@ -142,7 +144,7 @@ endif ifeq ($(PORTNAME), netbsd) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) ifdef ELF_SYSTEM - LINK.shared = $(COMPILER) -shared -Wl,-soname,$(soname) + LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname) else LINK.shared = $(LD) -x -Bshareable -Bforcearchive endif diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd index ef5613f98fa..c7f4f110d39 100644 --- a/src/makefiles/Makefile.freebsd +++ b/src/makefiles/Makefile.freebsd @@ -3,7 +3,7 @@ AROPT = cr ifdef ELF_SYSTEM export_dynamic = -export-dynamic rpath = -R$(libdir) -shlib_symbolic = -Bsymbolic +shlib_symbolic = -Wl,-Bsymbolic endif DLSUFFIX = .so diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd index 2ce2ca8ba1c..fbcc2e2e4bd 100644 --- a/src/makefiles/Makefile.openbsd +++ b/src/makefiles/Makefile.openbsd @@ -3,7 +3,7 @@ AROPT = cr ifdef ELF_SYSTEM export_dynamic = -Wl,-E rpath = -R$(libdir) -shlib_symbolic = -Bsymbolic +shlib_symbolic = -Wl,-Bsymbolic endif DLSUFFIX = .so |