summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-02-09 20:05:07 +0000
committerMike Frysinger <vapier@gentoo.org>2015-02-09 20:05:07 +0000
commit17ebc47b345c7fadb9fcd6ddcdc58961ec1fa3c0 (patch)
treeb92fc7443acef8364ae6315ac22d719f4fe22848 /eclass
parentFix bug #535942 (diff)
downloadgentoo-2-17ebc47b345c7fadb9fcd6ddcdc58961ec1fa3c0.tar.gz
gentoo-2-17ebc47b345c7fadb9fcd6ddcdc58961ec1fa3c0.tar.bz2
gentoo-2-17ebc47b345c7fadb9fcd6ddcdc58961ec1fa3c0.zip
use multislot for all cross-compilers and versions older than gcc-4.6
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index f1fc90d0bc4a..ab058f292ade 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.649 2015/02/05 23:28:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.650 2015/02/09 20:05:07 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}"