mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert rpath-mangling patch. See discussion on -patches around Nov 29 for

Browse Source 
the rationale.
This commit is contained in:
Peter Eisentraut 2003-01-05 13:45:47 +00:00
parent a60f9db508
commit 1bf1597e3a
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile.global.in
View File

@ -1,5 +1,5 @@
# -*-makefile-*-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.157 2002/12/30 17:19:50 tgl Exp $
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.158 2003/01/05 13:45:47 petere Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@ -190,9 +190,6 @@ LIBS = @LIBS@
LD = @LD@
with_gnu_ld = @with_gnu_ld@
ld_R_works = @ld_R_works@
# Set trpath to a list of library paths included in LDFLAGS
# These paths can be added to rpath in the port specific makefiles if needed.
trpath = $(filter -L%,@LDFLAGS@)
LDFLAGS = @LDFLAGS@
LDREL = -r
LDOUT = -o

18
src/makefiles/Makefile.unixware
View File

@ -7,23 +7,9 @@ endif
ifeq ($(ld_R_works), yes)
ifeq ($(with_gnu_ld), yes)
# Convert the list of library search paths into -rpath options
# (i.e. "-LpathA -LpathB" -> ",-rpath,pathA,-rpath,pathB"), adding
# the contents of LD_LIBRARY_PATH if it exists.
tpath1=$(shell echo $(trpath) | sed -e 's/ *-L/,-rpath,/g')
ifdef LD_LIBRARY_PATH
tpath2 = ,-rpath,$(shell echo $(LD_LIBRARY_PATH) | sed -e 's/:/,-rpath,/g')
endif
rpath = -Wl,-rpath,$(libdir)$(tpath)$(tpath2)
rpath = -Wl,-rpath,$(libdir)
else
# Convert the list of library search paths into a -R option path
# (i.e. "-LpathA -LpathB" -> ":pathA:pathB"), adding the contents of
# LD_LIBRARY_PATH if it exists.
tpath1 = $(shell echo $(trpath) | sed -e 's/ *-L/:/g')
ifdef LD_LIBRARY_PATH
tpath2 = :$(LD_LIBRARY_PATH)
endif
rpath = -Wl,-R$(libdir)$(tpath1)$(tpath2)
rpath = -Wl,-R$(libdir)
endif
endif
shlib_symbolic = -Wl,-Bsymbolic