aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-10-06 20:10:37 +0000
committerMike Frysinger <vapier@gentoo.org>2006-10-06 20:10:37 +0000
commit33423b7ffed87b140d924bc06ff35d353bfc4871 (patch)
tree7f3de812b3250a2f41909600f79b020a9d133a01 /ld
parentdd920c3388b68346e2cb4d8ffa801ef681af663d (diff)
downloadfsf-binutils-gdb-33423b7ffed87b140d924bc06ff35d353bfc4871.zip
fsf-binutils-gdb-33423b7ffed87b140d924bc06ff35d353bfc4871.tar.gz
fsf-binutils-gdb-33423b7ffed87b140d924bc06ff35d353bfc4871.tar.bz2
* genscripts.sh: Respect LIBPATH_SUFFIX when not using sysroot.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog4
-rwxr-xr-xld/genscripts.sh8
2 files changed, 12 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 09fd550..cdae47b 100644
--- 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
--- 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'`