* genscripts.sh (LIB_PATH): Include both {target_alias} and
{TOOL_LIB} in the search paths for multilibbed targets.
This commit is contained in:
parent
384e4a9cc2
commit
9b168ecec9
|
@ -1,3 +1,8 @@
|
||||||
|
2007-12-24 Hector Oron <hector.oron@gmail.com>
|
||||||
|
|
||||||
|
* genscripts.sh (LIB_PATH): Include both {target_alias} and
|
||||||
|
{TOOL_LIB} in the search paths for multilibbed targets.
|
||||||
|
|
||||||
2007-12-15 Richard Sandiford <rsandifo@nildram.co.uk>
|
2007-12-15 Richard Sandiford <rsandifo@nildram.co.uk>
|
||||||
|
|
||||||
* scripttempl/armbpabi.sc (.text): Don't KEEP (*(.text.*personality*)).
|
* scripttempl/armbpabi.sc (.text): Don't KEEP (*(.text.*personality*)).
|
||||||
|
|
|
@ -198,6 +198,27 @@ if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
|
||||||
*:: | ::*) LIB_PATH=${LIB_PATH}${LIB_PATH2} ;;
|
*:: | ::*) LIB_PATH=${LIB_PATH}${LIB_PATH2} ;;
|
||||||
*) LIB_PATH=${LIB_PATH}:${LIB_PATH2} ;;
|
*) LIB_PATH=${LIB_PATH}:${LIB_PATH2} ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# For multilib'ed targets, ensure both ${target_alias}/lib${LIBPATH_SUFFIX}
|
||||||
|
# and ${TOOL_LIB}/lib${LIBPATH_SUFFIX} are in the default search path, because
|
||||||
|
# 64bit libraries may be in both places, depending on cross-development
|
||||||
|
# setup method (e.g.: /usr/s390x-linux/lib64 vs /usr/s390-linux/lib64)
|
||||||
|
case "${LIBPATH_SUFFIX}:${tool_lib}" in
|
||||||
|
:*) ;;
|
||||||
|
*:*${LIBPATH_SUFFIX}) ;;
|
||||||
|
*)
|
||||||
|
paths="${exec_prefix}/${target_alias}/lib${LIBPATH_SUFFIX}"
|
||||||
|
if [ x"${TOOL_LIB}" != x ]; then
|
||||||
|
paths="${paths} ${exec_prefix}/${TOOL_LIB}/lib${LIBPATH_SUFFIX}"
|
||||||
|
fi
|
||||||
|
for path in $paths; do
|
||||||
|
case :${LIB_PATH}: in
|
||||||
|
::: | *:${path}:*) ;;
|
||||||
|
*) LIB_PATH=${path}:${LIB_PATH} ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib, except for
|
# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib, except for
|
||||||
|
|
Loading…
Reference in New Issue