summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-02-27 06:08:39 +0000
committerMike Frysinger <vapier@gentoo.org>2015-02-27 06:08:39 +0000
commit2281dc96b44772f5482489597f1d6370bf9b4185 (patch)
treeb5aede4cde83d3e684da5ad7da877d1f333575f6 /eclass
parentRemove bindist from IUSE as well. (diff)
downloadhistorical-2281dc96b44772f5482489597f1d6370bf9b4185.tar.gz
historical-2281dc96b44772f5482489597f1d6370bf9b4185.tar.bz2
historical-2281dc96b44772f5482489597f1d6370bf9b4185.zip
tc-ninja_magic_to_arch: fix matching for unofficial arches
this code matches a $CHOST and not an $ARCH, so we need a glob. also add microblaze.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain-funcs.eclass15
1 files changed, 8 insertions, 7 deletions
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index f6b847b3a9be..0c66efe5e482 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.131 2014/11/01 05:19:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.132 2015/02/27 06:08:39 vapier Exp $
# @ECLASS: toolchain-funcs.eclass
# @MAINTAINER:
@@ -373,10 +373,10 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; }
arm*) echo arm;;
avr*) ninj avr32 avr;;
bfin*) ninj blackfin bfin;;
- c6x) echo c6x;;
+ c6x*) echo c6x;;
cris*) echo cris;;
- frv) echo frv;;
- hexagon) echo hexagon;;
+ frv*) echo frv;;
+ hexagon*) echo hexagon;;
hppa*) ninj parisc hppa;;
i?86*)
# Starting with linux-2.6.24, the 'x86_64' and 'i386'
@@ -390,11 +390,12 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; }
;;
ia64*) echo ia64;;
m68*) echo m68k;;
- metag) echo metag;;
+ metag*) echo metag;;
+ microblaze*) echo microblaze;;
mips*) echo mips;;
nios2*) echo nios2;;
nios*) echo nios;;
- or32) echo openrisc;;
+ or32*) echo openrisc;;
powerpc*)
# Starting with linux-2.6.15, the 'ppc' and 'ppc64' trees
# have been unified into simply 'powerpc', but until 2.6.16,
@@ -417,7 +418,7 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; }
;;
riscv*) echo riscv;;
s390*) echo s390;;
- score) echo score;;
+ score*) echo score;;
sh64*) ninj sh64 sh;;
sh*) echo sh;;
sparc64*) ninj sparc64 sparc;;