diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-02-15 06:54:31 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-02-15 06:54:31 +0000 |
| commit | fb48c86e2f71fab38a2202dd9c85d1ce5ae45440 (patch) | |
| tree | fdd674dcf2de49d900f2a12dd2d57ae916ab5e12 /eclass | |
| parent | Switch to matching gcc versions as the SLOT in older versions is changing. (diff) | |
| download | historical-fb48c86e2f71fab38a2202dd9c85d1ce5ae45440.tar.gz historical-fb48c86e2f71fab38a2202dd9c85d1ce5ae45440.tar.bz2 historical-fb48c86e2f71fab38a2202dd9c85d1ce5ae45440.zip | |
reland multislot logic now that the three packages impacted have been updated
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index d34fff93032f..838da9373b06 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.653 2015/02/10 07:22:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.654 2015/02/15 06:54:31 vapier Exp $ # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -155,7 +155,7 @@ fi IUSE+=" ${IUSE_DEF[*]}" # Support upgrade paths here or people get pissed -if use multislot ; then +if ! tc_version_is_at_least 4.6 || is_crosscompile || use multislot ; then SLOT="${GCC_CONFIG_VER}" else SLOT="${GCC_BRANCH_VER}" |