* genscripts.sh: Respect LIBPATH_SUFFIX when not using sysroot.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 09fd550..cdae47b 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-06  Mike Frysinger  <vapier@gentoo.org>
+
+       * genscripts.sh: Respect LIBPATH_SUFFIX when not using sysroot.
+
 2006-10-04  Bob Wilson  <bob.wilson@acm.org>
 
        * emulparams/xtensa-config.sh: Delete file.

diff --git a/ld/genscripts.sh b/ld/genscripts.sh
index e9d4f15..81b78a2 100755 (executable)
--- a/ld/genscripts.sh
+++ b/ld/genscripts.sh
@@ -189,6 +189,14 @@ if [ "x${use_sysroot}" != "xyes" ] ; then
   ::) LIB_PATH=${tool_lib} ;;
   *) LIB_PATH=${tool_lib}:${LIB_PATH} ;;
   esac
+  # For multilib targets, search both $tool_lib dirs
+  if [ "x${LIBPATH_SUFFIX}" != "x" ] ; then
+    case :${LIB_PATH}: in
+      ::: | *:${tool_lib}${LIBPATH_SUFFIX}:*) ;;
+      ::) LIB_PATH=${tool_lib}${LIBPATH_SUFFIX} ;;
+      *) LIB_PATH=${tool_lib}${LIBPATH_SUFFIX}:${LIB_PATH} ;;
+    esac
+  fi
 fi
 
 LIB_SEARCH_DIRS=`echo ${LIB_PATH} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\");/g'`