diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-06-03 08:27:53 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-06-03 08:27:53 +0000 |
| commit | f1c1d847a623571518dbae3990151df6d4fd10cc (patch) | |
| tree | 86838baf0fb54a03d2b72c2ab6df9c19f8c03a2c /eclass | |
| parent | Version bump; remove old (diff) | |
| download | gentoo-2-f1c1d847a623571518dbae3990151df6d4fd10cc.tar.gz gentoo-2-f1c1d847a623571518dbae3990151df6d4fd10cc.tar.bz2 gentoo-2-f1c1d847a623571518dbae3990151df6d4fd10cc.zip | |
all callers to specify a different set of ABIs with get_all_abis so that we can query the abis for CTARGET with cross-compilers
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/multilib.eclass | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index e291b0f800a9..a2a6f7df90af 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.97 2011/12/14 18:15:09 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.98 2012/06/03 08:27:53 vapier Exp $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -162,19 +162,26 @@ get_install_abis() { # Return a list of the ABIs supported by this profile. # the last one in the list being the default. get_all_abis() { - local order="" + local order="" mvar dvar - if [[ -z ${MULTILIB_ABIS} ]] ; then + mvar="MULTILIB_ABIS" + dvar="DEFAULT_ABI" + if [[ -n $1 ]] ; then + mvar="$1_${mvar}" + dvar="$1_${dvar}" + fi + + if [[ -z ${!mvar} ]] ; then echo "default" return 0 fi - for x in ${MULTILIB_ABIS}; do - if [[ ${x} != ${DEFAULT_ABI} ]] ; then + for x in ${!mvar}; do + if [[ ${x} != ${!dvar} ]] ; then order="${order:+${order} }${x}" fi done - order="${order:+${order} }${DEFAULT_ABI}" + order="${order:+${order} }${!dvar}" echo ${order} return 0 |