[patches.git] / binutils-cross-multi-libsuffix.patch

http://sources.redhat.com/bugzilla/show_bug.cgi?id=2755

2006-09-24  Mike Frysinger  <vapier@gentoo.org>

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

--- binutils/ld/genscripts.sh
+++ binutils/ld/genscripts.sh
@@ -186,6 +186,14 @@
   ::) 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'`
Commit	Line	Data
	1	http://sources.redhat.com/bugzilla/show_bug.cgi?id=2755
	2
	3	2006-09-24 Mike Frysinger <vapier@gentoo.org>
	4
	5	* genscripts.sh: Respect LIBPATH_SUFFIX when not using sysroot.
	6
	7	--- binutils/ld/genscripts.sh
	8	+++ binutils/ld/genscripts.sh
	9	@@ -186,6 +186,14 @@
	10	::) LIB_PATH=${tool_lib} ;;
	11	*) LIB_PATH=${tool_lib}:${LIB_PATH} ;;
	12	esac
	13	+ # For multilib targets, search both $tool_lib dirs
	14	+ if [ "x${LIBPATH_SUFFIX}" != "x" ] ; then
	15	+ case :${LIB_PATH}: in
	16	+ ::: \| :${tool_lib}${LIBPATH_SUFFIX}:) ;;
	17	+ ::) LIB_PATH=${tool_lib}${LIBPATH_SUFFIX} ;;
	18	+ *) LIB_PATH=${tool_lib}${LIBPATH_SUFFIX}:${LIB_PATH} ;;
	19	+ esac
	20	+ fi
	21	fi
	22
	23	LIB_SEARCH_DIRS=`echo ${LIB_PATH} \| sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\");/g'`