summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2001-02-10 17:17:39 +0000
committerBruce Momjian2001-02-10 17:17:39 +0000
commitad5b1bb91f94efedc332f5dc86f6b6956848e323 (patch)
tree329cde3fb2d00cc507a236841bbc2ddca27cd7db
parentc6eafec72b0f1178a46d1dcfa6d270cdc42fbad6 (diff)
Fix -Bsymbolic for FreeBSD and OpenBSD. NetBSD already had all these fixes.
-rw-r--r--src/Makefile.shlib10
-rw-r--r--src/makefiles/Makefile.freebsd2
-rw-r--r--src/makefiles/Makefile.openbsd2
3 files changed, 8 insertions, 6 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 54f177e34f..3d65a150c3 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -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 ef5613f98f..c7f4f110d3 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 2ce2ca8ba1..fbcc2e2e4b 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