* configure.in: Substitute RPATH_ENVVAR.
* configure: Rebuild. * configure.host: Set RPATH_ENVVAR. * Makefile.in (RPATH_ENVVAR): New variable. (check): Use $(RPATH_ENVVAR) rather than LD_LIBRARY_PATH.
This commit is contained in:
Ian Lance Taylor
parent
efa864530f
commit
ad43e45b46
5 changed files with 26 additions and 10 deletions
|
|
@ -1,3 +1,11 @@
|
|||
Thu Feb 15 13:58:06 1996 Ian Lance Taylor <ian@cygnus.com>
|
||||
|
||||
* configure.in: Substitute RPATH_ENVVAR.
|
||||
* configure: Rebuild.
|
||||
* configure.host: Set RPATH_ENVVAR.
|
||||
* Makefile.in (RPATH_ENVVAR): New variable.
|
||||
(check): Use $(RPATH_ENVVAR) rather than LD_LIBRARY_PATH.
|
||||
|
||||
Wed Feb 14 18:49:01 1996 Alan Modra <alan@spri.levels.unisa.edu.au>
|
||||
|
||||
* configure.in: Redo emulation handling so that each emulation
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ AR_FLAGS = qv
|
|||
CC = @CC@
|
||||
CFLAGS = @CFLAGS@
|
||||
HLDFLAGS = @HLDFLAGS@
|
||||
RPATH_ENVVAR = @RPATH_ENVVAR@
|
||||
MAKEINFO = makeinfo
|
||||
TEXI2DVI = texi2dvi
|
||||
RANLIB = ranlib
|
||||
|
|
@ -581,8 +582,8 @@ check: site.exp
|
|||
r=`pwd`; export r; \
|
||||
srcroot=`cd ${srcdir}; pwd` ; export srcroot ; \
|
||||
EXPECT=${EXPECT} ; export EXPECT ; \
|
||||
LD_LIBRARY_PATH=$$r/../bfd:$$r/../opcodes:$$LD_LIBRARY_PATH; \
|
||||
export LD_LIBRARY_PATH; \
|
||||
$(RPATH_ENVVAR)=$$r/../bfd:$$r/../opcodes:$$$(RPATH_ENVVAR); \
|
||||
export $(RPATH_ENVVAR); \
|
||||
if [ -f $$r/../expect/expect ] ; then \
|
||||
TCL_LIBRARY=$${srcroot}/../tcl/library ; \
|
||||
export TCL_LIBRARY ; \
|
||||
|
|
|
|||
18
ld/configure
vendored
18
ld/configure
vendored
|
|
@ -759,6 +759,7 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
# For most hosts we can use a simple definition to pick up the BFD and
|
||||
# opcodes libraries. However, if we are building shared libraries, we
|
||||
# need to handle some hosts specially.
|
||||
|
|
@ -789,7 +790,7 @@ else
|
|||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 793 "configure"
|
||||
#line 794 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
|
|
@ -803,7 +804,7 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 807 "configure"
|
||||
#line 808 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
|
|
@ -836,7 +837,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 840 "configure"
|
||||
#line 841 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
|
|
@ -871,7 +872,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
|||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 875 "configure"
|
||||
#line 876 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -924,7 +925,7 @@ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
|
|||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 928 "configure"
|
||||
#line 929 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
|
|
@ -964,7 +965,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 968 "configure"
|
||||
#line 969 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() { return 0; }
|
||||
|
|
@ -999,7 +1000,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1003 "configure"
|
||||
#line 1004 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() { return 0; }
|
||||
|
|
@ -1042,7 +1043,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
|
|||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1046 "configure"
|
||||
#line 1047 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -1262,6 +1263,7 @@ s%@build_vendor@%$build_vendor%g
|
|||
s%@build_os@%$build_os%g
|
||||
s%@CC@%$CC%g
|
||||
s%@HLDFLAGS@%$HLDFLAGS%g
|
||||
s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
|
||||
s%@HDEFINES@%$HDEFINES%g
|
||||
s%@HOSTING_CRT0@%$HOSTING_CRT0%g
|
||||
s%@HOSTING_LIBS@%$HOSTING_LIBS%g
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
# HOSTING_CRT0 crt0.o file used for bootstrapping
|
||||
# HOSTING_LIBS libraries used for bootstrapping
|
||||
# NATIVE_LIB_DIRS library directories to search on this host
|
||||
# HLDFLAGS link flags to use on this host
|
||||
# RPATH_ENVVAR environment variable used to find shared libraries
|
||||
|
||||
HDEFINES=
|
||||
HOSTING_CRT0=/lib/crt0.o
|
||||
|
|
@ -133,11 +135,13 @@ sparc-*-solaris2*)
|
|||
esac
|
||||
|
||||
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)'
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ AC_ARG_PROGRAM
|
|||
AC_PROG_CC
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(HLDFLAGS)
|
||||
AC_SUBST(RPATH_ENVVAR)
|
||||
AC_SUBST(HDEFINES)
|
||||
AC_SUBST(HOSTING_CRT0)
|
||||
AC_SUBST(HOSTING_LIBS)
|
||||
|
|
|
|||
Loading…
Reference in a new issue