--- /usr/sbin/icecream-create-env	2010-06-08 00:48:44.923068151 +0200
+++ ./icecream-create-env	2010-06-10 20:35:46.562490569 +0200
@@ -10,7 +10,7 @@
 #
 #
 # Usage: "./icecream-create-env" creates a native environment(similar to icecc --build-native)
-#		 "./icecream-create-env CHOST" creates a cross-compile environment using the cross-toolchain created by crossdev
+#		 "./icecream-create-env prefix" creates a cross-compile environment using the cross-toolchain created by crossdev
 # Example:
 #        "emerge crossdev && crossdev -t sparc-unknown-linux-gnu && icecream-create-env sparc-unknown-linux"
 
@@ -20,7 +20,7 @@ then
 	exit 1
 fi
 
-# param 1 = CHOST
+# param 1 = prefix
 prefix="${1}"
 
 if [ -z "${prefix}" ]
@@ -51,6 +51,7 @@ if [ "`gcc -dumpmachine`" = "${prefix}" 
 then
 	/usr/lib/icecc/icecc-create-env /usr/${prefix}/gcc-bin/${version}/gcc /usr/${prefix}/gcc-bin/${version}/g++ | tee ${tmpfile}
 else
+    [[ -z ${CHOST} ]] && export CHOST=`gcc -dumpmachine`
     /usr/lib/icecc/icecc-create-env /usr/${CHOST}/${prefix}/gcc-bin/${version}/${prefix}-{gcc,g++} /usr/libexec/gcc/${prefix}/as | tee ${tmpfile}
 fi