Gentoo Archives: gentoo-commits

From:	"Mike Frysinger (vapier)" <vapier@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass
Date:	Mon, 09 Feb 2015 20:05:11
Message-Id:	`20150209200507.176E3D1F9@oystercatcher.gentoo.org`

1	vapier 15/02/09 20:05:07
2
3	Modified: toolchain.eclass
4	Log:
5	use multislot for all cross-compilers and versions older than gcc-4.6
6
7	Revision Changes Path
8	1.650 eclass/toolchain.eclass
9
10	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.650&view=markup
11	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.650&content-type=text/plain
12	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.649&r2=1.650
13
14	Index: toolchain.eclass
15	===================================================================
16	RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
17	retrieving revision 1.649
18	retrieving revision 1.650
19	diff -u -r1.649 -r1.650
20	--- toolchain.eclass 5 Feb 2015 23:28:17 -0000 1.649
21	+++ toolchain.eclass 9 Feb 2015 20:05:07 -0000 1.650
22	@@ -1,6 +1,6 @@
23	# Copyright 1999-2015 Gentoo Foundation
24	# Distributed under the terms of the GNU General Public License v2
25	-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.649 2015/02/05 23:28:17 blueness Exp $
26	+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.650 2015/02/09 20:05:07 vapier Exp $
27
28	# Maintainer: Toolchain Ninjas <toolchain@g.o>
29
30	@@ -155,7 +155,7 @@
31	IUSE+=" ${IUSE_DEF[*]}"
32
33	# Support upgrade paths here or people get pissed
34	-if use multislot ; then
35	+if ! tc_version_is_at_least 4.6 \|\| is_crosscompile \|\| use multislot ; then
36	SLOT="${GCC_CONFIG_VER}"
37	else
38	SLOT="${GCC_BRANCH_VER}"