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: Thu, 22 Nov 2012 05:19:49
Message-Id: 20121122051937.3918120C65@flycatcher.gentoo.org
1 vapier 12/11/22 05:19:37
2
3 Modified: toolchain.eclass
4 Log:
5 drop USE=nocxx support since everyone should be migrated now
6
7 Revision Changes Path
8 1.556 eclass/toolchain.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.556&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.556&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.555&r2=1.556
13
14 Index: toolchain.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
17 retrieving revision 1.555
18 retrieving revision 1.556
19 diff -u -r1.555 -r1.556
20 --- toolchain.eclass 19 Nov 2012 06:55:44 -0000 1.555
21 +++ toolchain.eclass 22 Nov 2012 05:19:37 -0000 1.556
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2012 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.555 2012/11/19 06:55:44 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.556 2012/11/22 05:19:37 vapier Exp $
27 #
28 # Maintainer: Toolchain Ninjas <toolchain@g.o>
29
30 @@ -100,7 +100,7 @@
31 IUSE="build multislot nls nptl test vanilla"
32
33 if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
34 - IUSE+=" altivec cxx fortran nocxx"
35 + IUSE+=" altivec cxx fortran"
36 [[ -n ${PIE_VER} ]] && IUSE+=" nopie"
37 [[ -n ${HTB_VER} ]] && IUSE+=" boundschecking"
38 [[ -n ${D_VER} ]] && IUSE+=" d"
39 @@ -1022,15 +1022,6 @@
40 gcc_do_configure() {
41 local confgcc
42
43 - # Sanity check for USE=nocxx -> USE=cxx migration
44 - if in_iuse cxx && in_iuse nocxx ; then
45 - if (use cxx && use nocxx) || (use !cxx && use !nocxx) ; then
46 - eerror "We are migrating USE=nocxx to USE=cxx, but your USE settings do not make"
47 - eerror "sense. Please make sure these two flags line up logically in your setup."
48 - die "USE='cxx nocxx' and USE='-cxx -nocxx' make no sense"
49 - fi
50 - fi
51 -
52 # Set configuration based on path variables
53 confgcc+=" \
54 --prefix=${PREFIX} \