[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass

[Mike Frysinger (vapier)]

vapier      13/12/31 00:33:44

  Modified:             toolchain.eclass
  Log:
  fix cross-compiling a stage1 with gcc-4.8 -- we can't enable c++ right away

Revision  Changes    Path
1.618                eclass/toolchain.eclass

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

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.617
retrieving revision 1.618
diff -u -r1.617 -r1.618
--- toolchain.eclass	31 Dec 2013 00:32:43 -0000	1.617
+++ toolchain.eclass	31 Dec 2013 00:33:43 -0000	1.618
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.617 2013/12/31 00:32:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.618 2013/12/31 00:33:43 vapier Exp $
 
 # Maintainer: Toolchain Ninjas <toolchain@g.o>
 
@@ -1932,7 +1932,7 @@
 
 is_cxx() {
 	gcc-lang-supported 'c++' || return 1
-	tc_version_is_at_least 4.8 && return 0
+	! is_crosscompile && tc_version_is_at_least 4.8 && return 0
 	use cxx
 }