diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-16 09:28:53 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-16 09:28:53 +0000 |
| commit | d6686f6bc3318e22e5f2d55d8443fc4c0fd4d1cc (patch) | |
| tree | 613cb1bc87efe2a08b72c180921a7cd203e0f2d6 /eclass | |
| parent | workaround broken tc-arch. (diff) | |
| download | gentoo-2-d6686f6bc3318e22e5f2d55d8443fc4c0fd4d1cc.tar.gz gentoo-2-d6686f6bc3318e22e5f2d55d8443fc4c0fd4d1cc.tar.bz2 gentoo-2-d6686f6bc3318e22e5f2d55d8443fc4c0fd4d1cc.zip | |
Fixed bad ninja.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 829afd3060d7..4fa49176ef98 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.24 2005/01/15 09:05:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.25 2005/01/16 09:28:53 eradicator Exp $ # # Author: Toolchain Ninjas <ninjas@gentoo.org> # @@ -93,7 +93,7 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } local type=$1 local host=$2 - [[ -z ${host} ]] && arg=${CTARGET:-${CHOST}} + [[ -z ${host} ]] && host=${CTARGET:-${CHOST}} case ${host} in alpha*) echo alpha;; @@ -111,7 +111,7 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } sh64*) ninj sh64 sh;; sh*) echo sh;; i?86*) ninj i386 x86;; - *) echo wtf;; + *) echo wtf;; esac } tc-arch-kernel() { diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 0b6984c68151..bf00af3dd216 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.83 2005/01/16 09:20:08 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.84 2005/01/16 09:28:53 eradicator Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -743,9 +743,7 @@ gcc_src_unpack() { ${ETYPE}_src_unpack || die "failed to ${ETYPE}_src_unpack" - #einfo "$(tc-arch)" # VAPIER: this gives me "wtf"... changing below to '${ARCH}' - - if [[ "${ARCH}" == "amd64" ]] \ + if [[ "$(tc-arch)" == "amd64" ]] \ && [[ -z ${SKIP_MULTILIB_HACK} ]] && use multilib then disgusting_gcc_multilib_HACK || die "multilib hack failed" |