diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-04-10 18:21:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-04-10 18:21:20 +0000 |
| commit | a2c45126e9cfe30f348823dffcfe7a03522b8ae6 (patch) | |
| tree | ff83772c238a49aa3acbabfd94688c48b6e4959d /eclass | |
| parent | stable x86, bug 356967 (diff) | |
| download | historical-a2c45126e9cfe30f348823dffcfe7a03522b8ae6.tar.gz historical-a2c45126e9cfe30f348823dffcfe7a03522b8ae6.tar.bz2 historical-a2c45126e9cfe30f348823dffcfe7a03522b8ae6.zip | |
drop unused GCC_TARGET_NO_MULTILIB logic, and keep all multilib logic flowing via is_multilib. change this latter function to only run on top of USE=multilib rather than tracking random CTARGETS as this is much more friendly to cross-compiling (especially now that crossdev takes care of multilib setup for toolchains).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 4d6d0a57dbad..7ab91637c1dc 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.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/toolchain.eclass,v 1.457 2011/04/10 16:54:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.458 2011/04/10 18:21:20 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -91,11 +91,9 @@ export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}} if [[ ${ETYPE} == "gcc-library" ]] ; then GCC_VAR_TYPE=${GCC_VAR_TYPE:-non-versioned} GCC_LIB_COMPAT_ONLY=${GCC_LIB_COMPAT_ONLY:-true} - GCC_TARGET_NO_MULTILIB=${GCC_TARGET_NO_MULTILIB:-true} else GCC_VAR_TYPE=${GCC_VAR_TYPE:-versioned} GCC_LIB_COMPAT_ONLY="false" - GCC_TARGET_NO_MULTILIB=${GCC_TARGET_NO_MULTILIB:-false} fi PREFIX=${TOOLCHAIN_PREFIX:-/usr} @@ -699,7 +697,7 @@ create_gcc_env_entry() { echo "ROOTPATH=\"${BINPATH}\"" >> ${gcc_envd_file} echo "GCC_PATH=\"${BINPATH}\"" >> ${gcc_envd_file} - if use multilib && ! has_multilib_profile; then + if is_multilib ; then LDPATH="${LIBPATH}" for path in 32 64 ; do [[ -d ${LIBPATH}/${path} ]] && LDPATH="${LDPATH}:${LIBPATH}/${path}" @@ -813,7 +811,7 @@ gcc_pkg_setup() { # Setup variables which would normally be in the profile if is_crosscompile ; then multilib_env ${CTARGET} - if ! use multilib ; then + if ! is_multilib ; then MULTILIB_ABIS=${DEFAULT_ABI} fi fi @@ -1120,17 +1118,17 @@ gcc_src_unpack() { } gcc-library-configure() { - # multilib support - [[ ${GCC_TARGET_NO_MULTILIB} == "true" ]] \ - && confgcc="${confgcc} --disable-multilib" \ - || confgcc="${confgcc} --enable-multilib" + if is_multilib ; then + confgcc="${confgcc} --enable-multilib" + else + confgcc="${confgcc} --disable-multilib" + fi } gcc-compiler-configure() { - # multilib support if is_multilib ; then confgcc="${confgcc} --enable-multilib" - elif [[ ${CTARGET} == *-linux* ]] ; then + else confgcc="${confgcc} --disable-multilib" fi @@ -1290,9 +1288,6 @@ gcc-compiler-configure() { # CBUILD # Enable building for a target that differs from CHOST # -# GCC_TARGET_NO_MULTILIB -# Disable multilib. Useful when building single library targets. -# # GCC_LANG # Enable support for ${GCC_LANG} languages. defaults to just "c" # @@ -2471,13 +2466,7 @@ fix_libtool_libdir_paths() { is_multilib() { [[ ${GCCMAJOR} < 3 ]] && return 1 - case ${CTARGET} in - mips64*|powerpc64*|s390x*|sparc*|x86_64*) - has_multilib_profile || use multilib ;; - *-*-solaris*|*-apple-darwin*|*-mint*) - use multilib ;; - *) false ;; - esac + use multilib } is_cxx() { |