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-minimal.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-minimal.eclass')
| -rw-r--r-- | eclass/multilib-minimal.eclass | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass index 2fec9cfc13a5..c638d0735133 100644 --- a/eclass/multilib-minimal.eclass +++ b/eclass/multilib-minimal.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.7 2013/12/27 22:47:14 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-minimal.eclass,v 1.8 2014/04/29 20:54:54 mgorny Exp $ # @ECLASS: multilib-minimal.eclass # @MAINTAINER: @@ -108,11 +108,9 @@ multilib-minimal_src_install() { emake DESTDIR="${D}" install fi fi - # Do multilib magic only when >1 ABI is used. - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then - multilib_prepare_wrappers - multilib_check_headers - fi + + multilib_prepare_wrappers + multilib_check_headers popd >/dev/null || die } multilib_foreach_abi multilib-minimal_abi_src_install |