summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2010-02-27 09:49:32 +0000
committerGreg Hudson <ghudson@mit.edu>2010-02-27 09:49:32 +0000
commite5b52cd8db901bd5c00890f7489c978930ea7786 (patch)
treeb6f2dc58666ff0fe013ff044a4ee2510b10670f4 /src
parenta0998e4082fc4e1346a2de45967a6ebe390d8a0e (diff)
downloadkrb5-e5b52cd8db901bd5c00890f7489c978930ea7786.tar.gz
krb5-e5b52cd8db901bd5c00890f7489c978930ea7786.tar.xz
krb5-e5b52cd8db901bd5c00890f7489c978930ea7786.zip
On Linux platforms, use -Wl,--enable-new-dtags when linking shared
libraries and programs using them. The primary effect is to get ld to set DT_RUNPATH in addition to DT_RPATH, which in turn allows the LD_LIBRARY_PATH environment variable to override the compiled-in runpath, which is friendlier to the test framework. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23758 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/config/shlib.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index beae4bfe3..88fa1dca5 100644
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -412,12 +412,12 @@ mips-*-netbsd*)
#
LDCOMBINE_TAIL='-Wl,--version-script binutils.versions && $(PERL) -w $(top_srcdir)/util/export-check.pl $(SHLIB_EXPORT_FILE) $@'
SHLIB_EXPORT_FILE_DEP=binutils.versions
+ RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,'
# For cases where we do have dependencies on other libraries
# built in this tree...
- SHLIB_RPATH_FLAGS='-Wl,-R$(SHLIB_RDIRS)'
+ SHLIB_RPATH_FLAGS='$(RPATH_FLAG)$(SHLIB_RDIRS)'
SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
PROFFLAGS=-pg
- RPATH_FLAG='-Wl,-rpath -Wl,'
PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)'
CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'