vapier 15/05/25 08:41:16 Modified: toolchain.eclass toolchain-binutils.eclass Log: use slightly more readable version of CATEGORY/cross-* checking
Revision Changes Path 1.670 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.670&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.670&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.669&r2=1.670 Index: toolchain.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v retrieving revision 1.669 retrieving revision 1.670 diff -u -r1.669 -r1.670 --- toolchain.eclass 13 May 2015 09:12:57 -0000 1.669 +++ toolchain.eclass 25 May 2015 08:41:16 -0000 1.670 @@ -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.669 2015/05/13 09:12:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.670 2015/05/25 08:41:16 vapier Exp $ # Maintainer: Toolchain Ninjas <toolch...@gentoo.org> @@ -37,8 +37,8 @@ export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} = ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi : ${TARGET_ABI:=${ABI}} 1.142 eclass/toolchain-binutils.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.142&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?rev=1.142&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-binutils.eclass?r1=1.141&r2=1.142 Index: toolchain-binutils.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- toolchain-binutils.eclass 25 May 2015 08:39:36 -0000 1.141 +++ toolchain-binutils.eclass 25 May 2015 08:41:16 -0000 1.142 @@ -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-binutils.eclass,v 1.141 2015/05/25 08:39:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.142 2015/05/25 08:41:16 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolch...@gentoo.org> # @@ -49,8 +49,8 @@ export CTARGET=${CTARGET:-${CHOST}} if [[ ${CTARGET} == ${CHOST} ]] ; then - if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then - export CTARGET=${CATEGORY/cross-} + if [[ ${CATEGORY} == cross-* ]] ; then + export CTARGET=${CATEGORY#cross-} fi fi is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
