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/cmake-multilib.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/cmake-multilib.eclass')
| -rw-r--r-- | eclass/cmake-multilib.eclass | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index 02d600815417..e7c9059e396b 100644 --- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.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/cmake-multilib.eclass,v 1.5 2014/04/03 22:09:36 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-multilib.eclass,v 1.6 2014/04/29 20:54:54 mgorny Exp $ # @ECLASS: cmake-multilib.eclass # @MAINTAINER: @@ -50,12 +50,9 @@ cmake-multilib_src_install() { cmake-multilib_secure_install() { cmake-utils_src_install "${@}" - # Do multilib magic only when >1 ABI is used. - if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then - multilib_prepare_wrappers - # Make sure all headers are the same for each ABI. - multilib_check_headers - fi + multilib_prepare_wrappers + # Make sure all headers are the same for each ABI. + multilib_check_headers } multilib_foreach_abi cmake-multilib_secure_install "${@}" |