mirror of
https://github.com/postgres/postgres.git
synced 2025-08-19 23:22:23 +03:00
Revert rpath-mangling patch. See discussion on -patches around Nov 29 for
the rationale.
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user