diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-03-10 04:26:38 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-10 04:26:38 +0000 |
| commit | 7173ebb6f44056822e31dc04b5a3189321bfc6b9 (patch) | |
| tree | 90af491e88e27471117db64e68e032a9e0248df0 /eclass | |
| parent | Fix static-libs usage (bug #336431 by Nikoli). (diff) | |
| download | gentoo-2-7173ebb6f44056822e31dc04b5a3189321bfc6b9.tar.gz gentoo-2-7173ebb6f44056822e31dc04b5a3189321bfc6b9.tar.bz2 gentoo-2-7173ebb6f44056822e31dc04b5a3189321bfc6b9.zip | |
dont hard reset MULTILIB_ABIS/DEFAULT_ABI ... this fixes no-multilib builds #358093 by Marien Zwart as well as is_final_abi handling #358143 by Pacho Ramos
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/multilib.eclass | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 3cdab1319f53..0a8a7ebef855 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.81 2011/03/10 01:52:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.82 2011/03/10 04:26:38 vapier Exp $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -589,8 +589,14 @@ multilib_env() { export CDEFINE_amd64="__x86_64__" export LIBDIR_amd64="lib64" - export MULTILIB_ABIS="amd64 x86" - export DEFAULT_ABI="amd64" + export CFLAGS_x32=${CFLAGS_x32--mx32} + export CHOST_x32=${CTARGET} + export CTARGET_x32=${CHOST_x32} + export CDEFINE_x32="__i386__" + export LIBDIR_x32="libx32" + + : ${MULTILIB_ABIS=amd64 x86} + : ${DEFAULT_ABI=amd64} ;; mips64*) export CFLAGS_o32=${CFLAGS_o32--mabi=32} @@ -611,8 +617,8 @@ multilib_env() { export CDEFINE_n64="_MIPS_SIM == _ABI64" export LIBDIR_n64="lib64" - export MULTILIB_ABIS="n64 n32 o32" - export DEFAULT_ABI="n32" + : ${MULTILIB_ABIS=n64 n32 o32} + : ${DEFAULT_ABI=n32} ;; powerpc64*) export CFLAGS_ppc=${CFLAGS_ppc--m32} @@ -627,8 +633,8 @@ multilib_env() { export CDEFINE_ppc64="__powerpc64__" export LIBDIR_ppc64="lib64" - export MULTILIB_ABIS="ppc64 ppc" - export DEFAULT_ABI="ppc64" + : ${MULTILIB_ABIS=ppc64 ppc} + : ${DEFAULT_ABI=ppc64} ;; s390x*) export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo @@ -643,8 +649,8 @@ multilib_env() { export CDEFINE_s390x="__s390x__" export LIBDIR_s390x="lib64" - export MULTILIB_ABIS="s390x s390" - export DEFAULT_ABI="s390x" + : ${MULTILIB_ABIS=s390x s390} + : ${DEFAULT_ABI=s390x} ;; sparc*) export CFLAGS_sparc32=${CFLAGS_sparc32} @@ -659,14 +665,16 @@ multilib_env() { export CDEFINE_sparc64="__arch64__" export LIBDIR_sparc64="lib64" - export MULTILIB_ABIS="${MULTILIB_ABIS-sparc64 sparc32}" - export DEFAULT_ABI="${DEFAULT_ABI-sparc64}" + : ${MULTILIB_ABIS=sparc64 sparc32} + : ${DEFAULT_ABI=sparc64} ;; *) - export MULTILIB_ABIS="default" - export DEFAULT_ABI="default" + : ${MULTILIB_ABIS=default} + : ${DEFAULT_ABI=default} ;; esac + + export MULTILIB_ABIS MULTILIB_ABI } # @FUNCTION: multilib_toolchain_setup |