summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-29 08:32:46 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-29 08:32:46 +0000
commitb14cab9f87aba242dc6ed56f7d7da20f5ba795ad (patch)
tree6106a43f74695f0dc98d2f0d95f2b616dd4c8e37 /eclass/multilib-build.eclass
parentAdd dependency towards sec-policy/selinux-nut if USE=selinux is set (diff)
downloadgentoo-2-b14cab9f87aba242dc6ed56f7d7da20f5ba795ad.tar.gz
gentoo-2-b14cab9f87aba242dc6ed56f7d7da20f5ba795ad.tar.bz2
gentoo-2-b14cab9f87aba242dc6ed56f7d7da20f5ba795ad.zip
Fix handling empty MULTILIB_COMPAT.
Diffstat (limited to 'eclass/multilib-build.eclass')
-rw-r--r--eclass/multilib-build.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 5f43f72fd048..ba3ebc044bda 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.58 2014/06/29 07:53:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.59 2014/06/29 08:32:46 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -154,7 +154,7 @@ multilib_get_enabled_abi_pairs() {
# for the split is more complex than cheating like this
for m_abi in ${m_abis//,/ }; do
if [[ ${m_abi} == ${abi} ]] \
- && has "${m_flag}" "${MULTILIB_COMPAT[@]}" \
+ && { [[ ! "${MULTILIB_COMPAT[@]}" ]] || has "${m_flag}" "${MULTILIB_COMPAT[@]}"; } \
&& use "${m_flag}"
then
echo "${m_flag}.${abi}"