From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 6 May 2010 19:28:25 +0000 (+0000)
Subject: On Linux, use --enable-new-dtags when specifying -rpath to linker.
X-Git-Tag: REL9_0_BETA2~172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd86869a9a56715a4143aff460f58ad9b4750475;p=postgresql

On Linux, use --enable-new-dtags when specifying -rpath to linker.
This should allow LD_LIBRARY_PATH to work as desired.  Per trouble
report from Andy Colson.
---

diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index d28c7f306d..e266e8fdd5 100644
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -1,6 +1,8 @@
 AROPT = crs
 export_dynamic = -Wl,-E
-rpath = -Wl,-rpath,'$(rpathdir)'
+# Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
+# This allows LD_LIBRARY_PATH to still work when needed.
+rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
 allow_nonpic_in_shlib = yes
 DLSUFFIX = .so