--- /usr/portage/eclass/multilib.eclass	2006-06-27 11:36:55.000000000 +0200
+++ /usr/local/portage/eclass/multilib.eclass	2006-06-28 09:21:05.000000000 +0200
@@ -663,11 +663,11 @@
 	if has_version app-admin/eselect-compiler ; then
 		# Binutils doesn't have wrappers for ld and as (yet).  Eventually it
 		# will, and all this can just be handled with CHOST.
-		export LD="ld $(get_abi_LDFLAGS)"
-		export AS="as $(get_abi_ASFLAGS)"
+		export LD="ld $(get_abi_LDFLAGS $1)"
+		export AS="as $(get_abi_ASFLAGS $1)"
 
-		export CHOST=$(get_abi_CHOST)
-		export CBUILD=$(get_abi_CHOST)
+		export CHOST=$(get_abi_CHOST $1)
+		export CBUILD=$(get_abi_CHOST $1)
 	else
 		tc-export CC
 		export ABI=$1