summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1997-02-21 17:02:14 +0000
committerTheodore Tso <tytso@mit.edu>1997-02-21 17:02:14 +0000
commite58edaac6c95aeae0d51520ac23284736375b2a8 (patch)
tree00a32a87b00d7551361da53b021204b5dac11a47 /src
parentfecbcd05c7200985159ed65826cada19b12effa9 (diff)
Linux doesn't understand -R; use "-bWl,-rpath -Wl,$(PROG_RPATH)" instead
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9941 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/aclocal.m42
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index eb0e4a75a..bec8b439b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 21 12:00:53 1997 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * aclocal.m4 (CC_LINK_SHARED): Linux doesn't understand -R; use
+ "-bWl,-rpath -Wl,$(PROG_RPATH)" instead.
+
Sun Feb 16 21:17:11 1997 Richard Basch <basch@lehman.com>
* Makefile.in: Build krb4 library under win16/win32
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index f529886d8..8fbd40159 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1214,7 +1214,7 @@ mips-sgi-irix*)
LDCOMBINE='ld -shared -h lib$(LIB)$(SHLIBEXT).$(LIBMAJOR).$(LIBMINOR)'
SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
PROFFLAGS=-pg
- CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -R$(PROG_RPATH)'
+ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
;;
esac])