summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin F. Quinn <kevquinn@gentoo.org>2006-07-12 07:40:49 +0000
committerKevin F. Quinn <kevquinn@gentoo.org>2006-07-12 07:40:49 +0000
commita5e28f53e97a6a77a7d5d641b578240bbaadeb1c (patch)
treef44786e6a4baf7f44bec39bc853386ea7d03e9e3 /eclass/multilib.eclass
parentRemove 2.1.1_pre2-r7 due to bug #140045. (diff)
downloadgentoo-2-a5e28f53e97a6a77a7d5d641b578240bbaadeb1c.tar.gz
gentoo-2-a5e28f53e97a6a77a7d5d641b578240bbaadeb1c.tar.bz2
gentoo-2-a5e28f53e97a6a77a7d5d641b578240bbaadeb1c.zip
Add abi parameter to get_abi_* calls in multilib_toolchain_setup (bug #138296)
since it is clearly necessary. Thanks to Rickard Narstrom.
Diffstat (limited to 'eclass/multilib.eclass')
-rw-r--r--eclass/multilib.eclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 4d6fb9ecde81..bb616d584216 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.53 2006/06/27 09:11:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.54 2006/07/12 07:40:49 kevquinn Exp $
#
# Author: Jeremy Huddleston <eradicator@gentoo.org>
#
@@ -663,11 +663,11 @@ multilib_toolchain_setup() {
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