-if [ "x${LIB_PATH}" = "x" ] ; then
- if [ "x${host}" = "x${target}" ] ; then
- case " $EMULATION_LIBPATH " in
- *" ${EMULATION_NAME} "*)
- # Native, and default or emulation requesting LIB_PATH.
- LIB_PATH=${libdir}
- for lib in ${NATIVE_LIB_DIRS}; do
- case :${LIB_PATH}: in
- *:${lib}:*) ;;
- *) LIB_PATH=${LIB_PATH}:${lib} ;;
- esac
- done
+# Paths with LIBPATH_SUFFIX
+lib_path1=
+# Paths without LIBPATH_SUFFIX
+lib_path2=
+if [ "${LIB_PATH}" != ":" ] ; then
+ lib_path2=${LIB_PATH}
+fi
+
+# Add args to lib_path1 and lib_path2, discarding any duplicates
+append_to_lib_path()
+{
+ if [ $# != 0 ]; then
+ for lib in "$@"; do
+ # The "=" is harmless if we aren't using a sysroot, but also needless.
+ if [ "x${use_sysroot}" = "xyes" ] ; then
+ lib="=${lib}"
+ fi
+ skip_lib=no
+ if test -n "${LIBPATH_SUFFIX}"; then
+ case "${lib}" in
+ *${LIBPATH_SUFFIX})
+ case :${lib_path1}: in
+ *:${lib}:*) ;;
+ ::) lib_path1=${lib} ;;
+ *) lib_path1=${lib_path1}:${lib} ;;
+ esac ;;
+ *)
+ if test -n "${LIBPATH_SUFFIX_SKIP}"; then
+ case "${lib}" in
+ *${LIBPATH_SUFFIX_SKIP}) skip_lib=yes ;;
+ esac
+ fi
+ if test "${skip_lib}" = "no"; then
+ case :${lib_path1}: in
+ *:${lib}${LIBPATH_SUFFIX}:*) ;;
+ ::) lib_path1=${lib}${LIBPATH_SUFFIX} ;;
+ *) lib_path1=${lib_path1}:${lib}${LIBPATH_SUFFIX} ;;
+ esac
+ fi ;;
+ esac
+ fi
+ if test "${skip_lib}" = "no"; then
+ case :${lib_path1}:${lib_path2}: in
+ *:${lib}:*) ;;
+ *::) lib_path2=${lib} ;;
+ *) lib_path2=${lib_path2}:${lib} ;;
+ esac
+ fi
+ done
+ fi
+}
+
+# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib when native
+# except when LIBPATH=":".
+if [ "${LIB_PATH}" != ":" ] ; then
+ libs=
+ if [ "x${TOOL_LIB}" = "x" ] ; then
+ if [ "x${NATIVE}" = "xyes" ] ; then
+ libs="${exec_prefix}/${target_alias}/lib"
+ fi
+ else
+ # 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 "${NATIVE}:${LIBPATH_SUFFIX}:${TOOL_LIB}" in
+ :* | *::* | *:*:*${LIBPATH_SUFFIX}) ;;
+ *) libs="${exec_prefix}/${target_alias}/lib${LIBPATH_SUFFIX}" ;;