summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-04-13 04:16:35 +0000
committerMike Frysinger <vapier@gentoo.org>2015-04-13 04:16:35 +0000
commitc6fbf536d1692b62bb9ff0fce1803e49f55a88fd (patch)
tree31bf6780cd1f6122421d75fce56f4f3c80764705 /eclass
parentforce the configure shell to bash to work around older configure detection (diff)
downloadgentoo-2-c6fbf536d1692b62bb9ff0fce1803e49f55a88fd.tar.gz
gentoo-2-c6fbf536d1692b62bb9ff0fce1803e49f55a88fd.tar.bz2
gentoo-2-c6fbf536d1692b62bb9ff0fce1803e49f55a88fd.zip
handle versions 6.x+ like 5.x
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index a1cee187c850..b26c6e3e78e8 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -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.661 2015/04/13 04:15:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.662 2015/04/13 04:16:35 vapier Exp $
# Maintainer: Toolchain Ninjas <toolchain@gentoo.org>
@@ -86,9 +86,9 @@ elif [[ ${GCC_PV} == *_rc* ]] ; then
SNAPSHOT=${GCC_PV%_rc*}-RC-${GCC_PV##*_rc}
fi
-if [[ ${SNAPSHOT} == 5.0-* ]] ; then
- # The gcc-5 release has dropped the .0 for some reason.
- SNAPSHOT=${SNAPSHOT/5.0/5}
+if [[ ${SNAPSHOT} == [56789].0-* ]] ; then
+ # The gcc-5+ releases have dropped the .0 for some reason.
+ SNAPSHOT=${SNAPSHOT/.0}
fi
export GCC_FILESDIR=${GCC_FILESDIR:-${FILESDIR}}