aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-05-06 19:28:25 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2010-05-06 19:28:25 +0000
commitcd86869a9a56715a4143aff460f58ad9b4750475 (patch)
tree310c98e995045720a0d1f6309aba80e4c07fd62c
parent72ee6703232fd21757613ab4889fab58de62144d (diff)
downloadpostgresql-cd86869a9a56715a4143aff460f58ad9b4750475.tar.gz
postgresql-cd86869a9a56715a4143aff460f58ad9b4750475.zip
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.
-rw-r--r--src/makefiles/Makefile.linux4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index d28c7f306d8..e266e8fdd5f 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