* configure: Set and substitute RPATH_ENVVAR.

* configure: Rebuild.
	* Makefile.in (RPATH_ENVVAR): New variable.
	(check): Use $(RPATH_ENVVAR) rather than LD_LIBRARY_PATH.
This commit is contained in:
Ian Lance Taylor 1996-02-15 19:00:54 +00:00
parent 5c7516eee0
commit 1a2f3c3f1f
3 changed files with 12 additions and 0 deletions

View File

@ -1,5 +1,10 @@
Thu Feb 15 11:20:18 1996 Ian Lance Taylor <ian@cygnus.com> 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 * configure.in: Accept i686. From H.J. Lu <hjl@zoom.com>: i386
doesn't need opcodes. If configuring shared, opcodes needs bfd. doesn't need opcodes. If configuring shared, opcodes needs bfd.
* configure: Rebuild. * configure: Rebuild.

4
gas/configure vendored
View File

@ -2118,11 +2118,13 @@ EOF
HLDFLAGS= HLDFLAGS=
RPATH_ENVVAR=LD_LIBRARY_PATH
# If we have shared libraries, try to set rpath reasonably. # If we have shared libraries, try to set rpath reasonably.
if test "${shared}" = "true"; then if test "${shared}" = "true"; then
case "${host}" in case "${host}" in
*-*-hpux*) *-*-hpux*)
HLDFLAGS='-Wl,+s,+b,$(libdir)' HLDFLAGS='-Wl,+s,+b,$(libdir)'
RPATH_ENVVAR=SHLIB_PATH
;; ;;
*-*-irix5*) *-*-irix5*)
HLDFLAGS='-Wl,-rpath,$(libdir)' HLDFLAGS='-Wl,-rpath,$(libdir)'
@ -2159,6 +2161,7 @@ case "${host}" in
esac esac
trap '' 1 2 15 trap '' 1 2 15
cat > confcache <<\EOF cat > confcache <<\EOF
# This file is a shell script that caches the results of configure # 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%@CPP@%$CPP%g
s%@ALLOCA@%$ALLOCA%g s%@ALLOCA@%$ALLOCA%g
s%@HLDFLAGS@%$HLDFLAGS%g s%@HLDFLAGS@%$HLDFLAGS%g
s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
CEOF CEOF
EOF EOF

View File

@ -619,11 +619,13 @@ GAS_CHECK_DECL_NEEDED(errno, f, int f, [
]) ])
HLDFLAGS= HLDFLAGS=
RPATH_ENVVAR=LD_LIBRARY_PATH
# If we have shared libraries, try to set rpath reasonably. # If we have shared libraries, try to set rpath reasonably.
if test "${shared}" = "true"; then if test "${shared}" = "true"; then
case "${host}" in case "${host}" in
*-*-hpux*) *-*-hpux*)
HLDFLAGS='-Wl,+s,+b,$(libdir)' HLDFLAGS='-Wl,+s,+b,$(libdir)'
RPATH_ENVVAR=SHLIB_PATH
;; ;;
*-*-irix5*) *-*-irix5*)
HLDFLAGS='-Wl,-rpath,$(libdir)' HLDFLAGS='-Wl,-rpath,$(libdir)'
@ -659,6 +661,7 @@ case "${host}" in
;; ;;
esac esac
AC_SUBST(HLDFLAGS) AC_SUBST(HLDFLAGS)
AC_SUBST(RPATH_ENVVAR)
dnl This must come last. dnl This must come last.
AC_OUTPUT(Makefile doc/Makefile .gdbinit:gdbinit.in) AC_OUTPUT(Makefile doc/Makefile .gdbinit:gdbinit.in)