* genscripts.sh: Apply $LIBPATH_SUFFIX to $tool_lib and $libdir too.
This commit is contained in:
parent
2a35147e4a
commit
1dd3bf6876
2 changed files with 18 additions and 4 deletions
|
@ -1,3 +1,7 @@
|
|||
2004-01-28 Alan Modra <amodra@bigpond.net.au>
|
||||
|
||||
* genscripts.sh: Apply $LIBPATH_SUFFIX to $tool_lib and $libdir too.
|
||||
|
||||
2004-01-24 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
* emulparams/elf64_ia64.sh: Put .rela.opd into
|
||||
|
|
|
@ -128,10 +128,20 @@ fi
|
|||
|
||||
if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
|
||||
LIB_PATH2=
|
||||
if [ x"$use_sysroot" != xyes ] ; then
|
||||
LIB_PATH2=${libdir}
|
||||
|
||||
libs=${NATIVE_LIB_DIRS}
|
||||
if [ "x${use_sysroot}" != "xyes" ] ; then
|
||||
case " ${libs} " in
|
||||
*" ${libdir} "*) ;;
|
||||
*) libs="${libdir} ${libs}"
|
||||
esac
|
||||
case " ${libs} " in
|
||||
*" ${tool_lib} "*) ;;
|
||||
*) libs="${tool_lib} ${libs}"
|
||||
esac
|
||||
fi
|
||||
for lib in ${NATIVE_LIB_DIRS}; do
|
||||
|
||||
for lib in ${libs}; do
|
||||
# The "=" is harmless if we aren't using a sysroot, but also needless.
|
||||
if [ "x${use_sysroot}" = "xyes" ] ; then
|
||||
lib="=${lib}"
|
||||
|
@ -161,13 +171,13 @@ if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
|
|||
esac
|
||||
fi
|
||||
done
|
||||
|
||||
case :${LIB_PATH}:${LIB_PATH2}: in
|
||||
*:: | ::*) LIB_PATH=${LIB_PATH}${LIB_PATH2} ;;
|
||||
*) LIB_PATH=${LIB_PATH}:${LIB_PATH2} ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib, except for
|
||||
# sysrooted configurations and when LIBPATH=":".
|
||||
if [ "x${use_sysroot}" != "xyes" ] ; then
|
||||
|
|
Loading…
Reference in a new issue