use CBUILD / CHOST in the default case of tc-is-cross-compiler

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 40028551fb74a6f76009ee029b463c3334580862..bc2b25afa4740f614368f9145e3ecc69d9081fa4 100644 (file)
--- 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.14 2004/12/14 05:31:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.15 2004/12/14 14:28:57 vapier Exp $
 #
 # Author: Toolchain Ninjas <ninjas@gentoo.org>
 #
@@ -89,6 +89,12 @@ tc-export() {
 
 # A simple way to see if we're using a cross-compiler ...
 tc-is-cross-compiler() {
+       # Simple case ... the user tells us what's going on
+       if [[ -n ${CBUILD} ]] ; then
+               return $([[ ${CBUILD} != ${CHOST} ]])
+       fi
+
+       # Hard case ... compile a simple prog and run it ...
        local ret tmpfile=$(emktemp).c
        echo 'int main(){return 0;}' > "${tmpfile}"
        $(tc-getCC) "${tmpfile}" -o "${tmpfile}".bin