diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-04-29 20:54:54 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-04-29 20:54:54 +0000 |
| commit | 957dea54df8241cd1894e4d012c8ea8c9f9153fe (patch) | |
| tree | cc8eaafa32c3a34df6cf686cbf5ff9bb699e47f9 /eclass/multilib-build.eclass | |
| parent | Add arm64/m68k love. (diff) | |
| download | gentoo-2-957dea54df8241cd1894e4d012c8ea8c9f9153fe.tar.gz gentoo-2-957dea54df8241cd1894e4d012c8ea8c9f9153fe.tar.bz2 gentoo-2-957dea54df8241cd1894e4d012c8ea8c9f9153fe.zip | |
Move conditionals for enabling wrappers into multilib_prepare_wrappers() and multilib_install_wrappers().
Diffstat (limited to 'eclass/multilib-build.eclass')
| -rw-r--r-- | eclass/multilib-build.eclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 2ca8d82a6f9a..b7a1aff8c3c2 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.40 2014/04/28 17:38:21 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.41 2014/04/29 20:54:54 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -295,6 +295,8 @@ multilib_prepare_wrappers() { [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" + [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return + local root=${1:-${ED}} local f @@ -419,6 +421,8 @@ multilib_install_wrappers() { [[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" + [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return + local root=${1:-${ED}} if [[ -d "${ED}"/tmp/multilib-include ]]; then |