From: Ryan Hill <rhill@gentoo.org>
Date: Sat, 13 Aug 2011 03:09:40 +0000 (+0000)
Subject: Check image dir rather than filesystem for multilib paths so we get proper LDPATHs... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0f93b07159661482672eb1b1247849183c5ee9dd;p=gentoo.git

Check image dir rather than filesystem for multilib paths so we get proper LDPATHs on up/downgrades.  Bug #377633.
---

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b04dcb84c0b9..780e425dfbb9 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.461 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.462 2011/08/13 03:09:40 dirtyepic Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
 
@@ -695,7 +695,7 @@ create_gcc_env_entry() {
 	if is_multilib ; then
 		LDPATH="${LIBPATH}"
 		for path in 32 64 ; do
-			[[ -d ${LIBPATH}/${path} ]] && LDPATH="${LDPATH}:${LIBPATH}/${path}"
+			[[ -d ${D}${LIBPATH}/${path} ]] && LDPATH="${LDPATH}:${LIBPATH}/${path}"
 		done
 	else
 		local MULTIDIR