diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2006-01-07 04:40:45 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2006-01-07 04:40:45 +0000 |
| commit | 00c3ac266ecf839276c13bb9124ae7bb1c1542f7 (patch) | |
| tree | 2a548e71fdd9ed39e144d5fa6e8021c86a1fe465 /eclass/multilib.eclass | |
| parent | New version (diff) | |
| download | gentoo-2-00c3ac266ecf839276c13bb9124ae7bb1c1542f7.tar.gz gentoo-2-00c3ac266ecf839276c13bb9124ae7bb1c1542f7.tar.bz2 gentoo-2-00c3ac266ecf839276c13bb9124ae7bb1c1542f7.zip | |
Fix bug #110143.
Diffstat (limited to 'eclass/multilib.eclass')
| -rw-r--r-- | eclass/multilib.eclass | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 60a85cfaac56..f8fcf1cdbcd8 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.46 2005/10/17 08:45:38 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.47 2006/01/07 04:40:45 eradicator Exp $ # # Author: Jeremy Huddleston <eradicator@gentoo.org> # @@ -268,14 +268,15 @@ get_all_libdirs() { local abi local dir - if has_multilib_profile; then - for abi in ${MULTILIB_ABIS}; do - [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" - done - elif [ -n "${CONF_LIBDIR}" ]; then + # Remove when amd64's 2004.3 is purged. + if [[ -n "${CONF_LIBDIR}" ]]; then for dir in ${CONF_LIBDIR} ${CONF_MULTILIBDIR:-lib32}; do [ "${dir}" != "lib" ] && libdirs="${libdirs} ${dir}" done + else + for abi in ${MULTILIB_ABIS}; do + [ "$(get_abi_LIBDIR ${abi})" != "lib" ] && libdirs="${libdirs} $(get_abi_LIBDIR ${abi})" + done fi echo "${libdirs}" |