Skip to content

P
Postgres FD Implementation
Commit 00ab7b58 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Fix -Bsymbolic for FreeBSD and OpenBSD. NetBSD already had all these fixes.

parent 8213e63d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
src/Makefile.shlib
View file @ 00ab7b58
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California # Copyright (c) 1998, Regents of the University of California
# #
# IDENTIFICATION # 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 ...@@ -112,7 +112,8 @@ endif
ifeq ($(PORTNAME), openbsd) ifeq ($(PORTNAME), openbsd)
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
ifdef ELF_SYSTEM ifdef ELF_SYSTEM
LINK.shared = $(LD) -x -Bshareable -soname $(soname) LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
SHLIB_LINK += -lc
else else
LINK.shared = $(LD) -x -Bshareable -Bforcearchive LINK.shared = $(LD) -x -Bshareable -Bforcearchive
endif endif
...@@ -121,7 +122,7 @@ endif ...@@ -121,7 +122,7 @@ endif
ifeq ($(PORTNAME), bsdi) ifeq ($(PORTNAME), bsdi)
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
ifeq ($(DLSUFFIX), .so) ifeq ($(DLSUFFIX), .so)
LINK.shared = $(COMPILER) -shared -Wl,-soname,$(soname) LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
SHLIB_LINK += -lc SHLIB_LINK += -lc
endif endif
ifeq ($(DLSUFFIX), .o) ifeq ($(DLSUFFIX), .o)
...@@ -132,7 +133,8 @@ endif ...@@ -132,7 +133,8 @@ endif
ifeq ($(PORTNAME), freebsd) ifeq ($(PORTNAME), freebsd)
ifdef ELF_SYSTEM ifdef ELF_SYSTEM
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) 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 else
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LINK.shared = $(LD) -x -Bshareable -Bforcearchive LINK.shared = $(LD) -x -Bshareable -Bforcearchive
...@@ -142,7 +144,7 @@ endif ...@@ -142,7 +144,7 @@ endif
ifeq ($(PORTNAME), netbsd) ifeq ($(PORTNAME), netbsd)
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
ifdef ELF_SYSTEM ifdef ELF_SYSTEM
LINK.shared = $(COMPILER) -shared -Wl,-soname,$(soname) LINK.shared = $(COMPILER) -shared -Wl,-x,-soname,$(soname)
else else
LINK.shared = $(LD) -x -Bshareable -Bforcearchive LINK.shared = $(LD) -x -Bshareable -Bforcearchive
endif endif
......
src/makefiles/Makefile.freebsd
View file @ 00ab7b58
...@@ -3,7 +3,7 @@ AROPT = cr ...@@ -3,7 +3,7 @@ AROPT = cr
ifdef ELF_SYSTEM ifdef ELF_SYSTEM
export_dynamic = -export-dynamic export_dynamic = -export-dynamic
rpath = -R$(libdir) rpath = -R$(libdir)
shlib_symbolic = -Bsymbolic shlib_symbolic = -Wl,-Bsymbolic
endif endif
DLSUFFIX = .so DLSUFFIX = .so
......
src/makefiles/Makefile.openbsd
View file @ 00ab7b58
...@@ -3,7 +3,7 @@ AROPT = cr ...@@ -3,7 +3,7 @@ AROPT = cr
ifdef ELF_SYSTEM ifdef ELF_SYSTEM
export_dynamic = -Wl,-E export_dynamic = -Wl,-E
rpath = -R$(libdir) rpath = -R$(libdir)
shlib_symbolic = -Bsymbolic shlib_symbolic = -Wl,-Bsymbolic
endif endif
DLSUFFIX = .so DLSUFFIX = .so
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment