mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 00:11:53 +02:00
Revert rpath-mangling patch. See discussion on -patches around Nov 29 for
the rationale.
This commit is contained in:
parent
a60f9db508
commit
1bf1597e3a
@ -1,5 +1,5 @@
|
|||||||
# -*-makefile-*-
|
# -*-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,
|
# All PostgreSQL makefiles include this file and use the variables it sets,
|
||||||
@ -190,9 +190,6 @@ LIBS = @LIBS@
|
|||||||
LD = @LD@
|
LD = @LD@
|
||||||
with_gnu_ld = @with_gnu_ld@
|
with_gnu_ld = @with_gnu_ld@
|
||||||
ld_R_works = @ld_R_works@
|
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@
|
LDFLAGS = @LDFLAGS@
|
||||||
LDREL = -r
|
LDREL = -r
|
||||||
LDOUT = -o
|
LDOUT = -o
|
||||||
|
@ -7,23 +7,9 @@ endif
|
|||||||
|
|
||||||
ifeq ($(ld_R_works), yes)
|
ifeq ($(ld_R_works), yes)
|
||||||
ifeq ($(with_gnu_ld), yes)
|
ifeq ($(with_gnu_ld), yes)
|
||||||
# Convert the list of library search paths into -rpath options
|
rpath = -Wl,-rpath,$(libdir)
|
||||||
# (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)
|
|
||||||
else
|
else
|
||||||
# Convert the list of library search paths into a -R option path
|
rpath = -Wl,-R$(libdir)
|
||||||
# (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)
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
shlib_symbolic = -Wl,-Bsymbolic
|
shlib_symbolic = -Wl,-Bsymbolic
|
||||||
|
Loading…
Reference in New Issue
Block a user