aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1996-02-15 19:00:54 +0000
committerIan Lance Taylor <ian@airs.com>1996-02-15 19:00:54 +0000
commit1a2f3c3f1f48a069ecafa50fe7ab81e0718270c9 (patch)
tree7067f73a3bb392aa8e88b802d7f911712403044d /gas
parent5c7516eee0beffb52e5796675cad5dfd0bf8f6f9 (diff)
downloadgdb-1a2f3c3f1f48a069ecafa50fe7ab81e0718270c9.zip
gdb-1a2f3c3f1f48a069ecafa50fe7ab81e0718270c9.tar.gz
gdb-1a2f3c3f1f48a069ecafa50fe7ab81e0718270c9.tar.bz2
* configure: Set and substitute RPATH_ENVVAR.
* configure: Rebuild. * Makefile.in (RPATH_ENVVAR): New variable. (check): Use $(RPATH_ENVVAR) rather than LD_LIBRARY_PATH.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog5
-rwxr-xr-xgas/configure4
-rw-r--r--gas/configure.in3
3 files changed, 12 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 259b46d..5e61d18 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
Thu Feb 15 11:20:18 1996 Ian Lance Taylor <ian@cygnus.com>
+ * configure: Set and substitute RPATH_ENVVAR.
+ * configure: Rebuild.
+ * Makefile.in (RPATH_ENVVAR): New variable.
+ (check): Use $(RPATH_ENVVAR) rather than LD_LIBRARY_PATH.
+
* configure.in: Accept i686. From H.J. Lu <hjl@zoom.com>: i386
doesn't need opcodes. If configuring shared, opcodes needs bfd.
* configure: Rebuild.
diff --git a/gas/configure b/gas/configure
index 11e5418..c88acf3 100755
--- a/gas/configure
+++ b/gas/configure
@@ -2118,11 +2118,13 @@ EOF
HLDFLAGS=
+RPATH_ENVVAR=LD_LIBRARY_PATH
# If we have shared libraries, try to set rpath reasonably.
if test "${shared}" = "true"; then
case "${host}" in
*-*-hpux*)
HLDFLAGS='-Wl,+s,+b,$(libdir)'
+ RPATH_ENVVAR=SHLIB_PATH
;;
*-*-irix5*)
HLDFLAGS='-Wl,-rpath,$(libdir)'
@@ -2159,6 +2161,7 @@ case "${host}" in
esac
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -2308,6 +2311,7 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@CPP@%$CPP%g
s%@ALLOCA@%$ALLOCA%g
s%@HLDFLAGS@%$HLDFLAGS%g
+s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
CEOF
EOF
diff --git a/gas/configure.in b/gas/configure.in
index 372332b..6805496 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -619,11 +619,13 @@ GAS_CHECK_DECL_NEEDED(errno, f, int f, [
])
HLDFLAGS=
+RPATH_ENVVAR=LD_LIBRARY_PATH
# If we have shared libraries, try to set rpath reasonably.
if test "${shared}" = "true"; then
case "${host}" in
*-*-hpux*)
HLDFLAGS='-Wl,+s,+b,$(libdir)'
+ RPATH_ENVVAR=SHLIB_PATH
;;
*-*-irix5*)
HLDFLAGS='-Wl,-rpath,$(libdir)'
@@ -659,6 +661,7 @@ case "${host}" in
;;
esac
AC_SUBST(HLDFLAGS)
+AC_SUBST(RPATH_ENVVAR)
dnl This must come last.
AC_OUTPUT(Makefile doc/Makefile .gdbinit:gdbinit.in)