vapier      15/02/15 06:54:31

  Modified:             toolchain.eclass
  Log:
  reland multislot logic now that the three packages impacted have been updated

Revision  Changes    Path
1.654                eclass/toolchain.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.654&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.654&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.653&r2=1.654

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -r1.653 -r1.654
--- toolchain.eclass    10 Feb 2015 07:22:00 -0000      1.653
+++ toolchain.eclass    15 Feb 2015 06:54:31 -0000      1.654
@@ -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 <[email protected]>
 
@@ -155,7 +155,7 @@
 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}"




Reply via email to