diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-10-06 20:10:37 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-10-06 20:10:37 +0000 |
| commit | 2617ae291a27d3eca32b081228dd15f3b7764938 (patch) | |
| tree | 08f679a2103d127e8b1c034bf70de6bee7c1c31e | |
| parent | 4764391e353a318905d05e7dec9c6b9a7e970d98 (diff) | |
| download | binutils-redhat-2617ae291a27d3eca32b081228dd15f3b7764938.tar.gz | |
* genscripts.sh: Respect LIBPATH_SUFFIX when not using sysroot.
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rwxr-xr-x | ld/genscripts.sh | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 09fd5505f5..cdae47b65d 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 e9d4f153a7..81b78a2cf3 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'` |