diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2006-08-19 18:54:04 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2006-08-19 18:54:04 +0000 |
| commit | 6852dfab13a1807581f951e7f1431054bc7747ca (patch) | |
| tree | 8122ad0c8c83c887305144c0fd0e0ace04e12ce3 /eclass/multilib.eclass | |
| parent | stable amd64 (diff) | |
| download | gentoo-2-6852dfab13a1807581f951e7f1431054bc7747ca.tar.gz gentoo-2-6852dfab13a1807581f951e7f1431054bc7747ca.tar.bz2 gentoo-2-6852dfab13a1807581f951e7f1431054bc7747ca.zip | |
Reversing a change vapier made which broke some packages. ABI still needs to be set for get_libdir, etc.
Diffstat (limited to 'eclass/multilib.eclass')
| -rw-r--r-- | eclass/multilib.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index bb616d584216..693da613bf6d 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.54 2006/07/12 07:40:49 kevquinn Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.55 2006/08/19 18:54:04 eradicator Exp $ # # Author: Jeremy Huddleston <eradicator@gentoo.org> # @@ -660,6 +660,8 @@ multilib_env() { # Hide multilib details here for packages which are forced to be compiled for a # specific ABI when run on another ABI (like x86-specific packages on amd64) multilib_toolchain_setup() { + export ABI=$1 + 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. @@ -670,6 +672,5 @@ multilib_toolchain_setup() { export CBUILD=$(get_abi_CHOST $1) else tc-export CC - export ABI=$1 fi } |