DELETED build/fake-bin/uname
Index: build/fake-bin/uname
==================================================================
--- build/fake-bin/uname
+++ /dev/null
@@ -1,113 +0,0 @@
-#! /usr/bin/env bash
-
-if [ "$1" == "--fake" ]; then
-	echo "true"
-
-	exit 0
-fi
-
-# Some systems do not compile well with this fake uname in place
-# provide the real uname for them.
-case "${CROSS}" in
-	mipsel-unknown-linux-uclibc)
-		unset CROSS
-		;;
-esac
-
-if [ -z "${CROSS}" ]; then
-	# If not cross compiling, revert to system uname
-	while [ "$(uname --fake 2>/dev/null)" == "true" -a -n "${PATH}" ]; do
-		PATH="$(echo "${PATH}" | /usr/bin/sed 's@^[^:]*$@@;s@^[^:]*:@@')"
-
-		export PATH
-	done
-
-	if [ -z "${PATH}" ]; then
-		exit 1
-	fi
-
-	exec uname "$@"
-fi
-
-CROSS="$(echo "${CROSS}" | sed 's@-*$@@')"
-
-# Determine release information
-case "${CROSS}" in
-	*-hpux11*)
-		sysname="HP-UX"
-		sysrelease="$(echo "${CROSS}" | sed 's@^.*-hpux@@')"
-		;;
-	*-solaris2*)
-		sysname="SunOS"
-		sysrelease="$(echo "${CROSS}" | sed 's@^.*-solaris@@;s@^2@5@')"
-		;;
-	*-linux*)
-		sysname="Linux"
-		sysrelease="2.6.5"
-		;;
-	*-netbsd*)
-		sysname="NetBSD"
-		sysrelease="$(echo "${CROSS}" | sed 's@^.*-netbsd@@;s@$@.0@')"
-		;;
-	*-freebsd*)
-		sysname="FreeBSD"
-		sysrelease="$(echo "${CROSS}" | sed 's@^.*-freebsd@@;s@$@.0-RELEASE@')"
-		;;
-esac
-
-# Determine machine information
-case "${CROSS}" in
-	hppa64-*-hpux*)
-		sysmachine="9000/859"
-		;;
-	i386-*-solaris*)
-		sysmachine="i86pc"
-		;;
-	sparc-*-solaris*)
-		sysmachine="sun4u"
-		;;
-	x86_64-*)
-		sysmachine="x86_64"
-		;;
-	i?86-*)
-		sysmachine="i686"
-		;;
-	ia64-*)
-		sysmachine="ia64"
-		;;
-	arm-*|armel-*|armeb-*)
-		sysmachine="armv7l"
-		;;
-	mipsel-*|mipseb-*)
-		sysmachine="mips"
-		;;
-esac
-
-for arg in $(echo "$@" | sed 's@.@ & @g'); do
-	case "${arg}" in
-		-)
-			continue
-			;;
-		r)
-			retval="${retval} ${sysrelease}"
-			;;
-		s)
-			retval="${retval} ${sysname}"
-			;;
-		m)
-			retval="${retval} ${sysmachine}"
-			;;
-		p)
-			# XXX
-			retval="${retval} ${syscpu}"
-			;;
-		n)
-			retval="${retval} $(hostname)"
-			;;
-		a)
-			retval="${sysname} $(hostname) ${sysrelease} ${sysversion} ${sysmachine} ${syscpu}"
-			;;
-	esac
-done
-
-echo "${retval}" | sed 's@^  *@@;s@  *$@@'

Index: build/make-kit-crosscompile
==================================================================
--- build/make-kit-crosscompile
+++ build/make-kit-crosscompile
@@ -7,11 +7,11 @@
 fi
 
 CCROOT="${HOME}/root/cross-compilers/${CROSS}"
 CCROOTBIN="${CCROOT}/bin"
 
-PATH="$(pwd)/build/fake-bin:${PATH}:${CCROOTBIN}"
+PATH="${PATH}:${CCROOTBIN}"
 AR="${CCROOTBIN}/${CROSS}-ar"
 CC="${CCROOTBIN}/${CROSS}-gcc ${CC_ADD}"
 CXX="${CCROOTBIN}/${CROSS}-g++ ${CC_ADD}"
 RANLIB="${CCROOTBIN}/${CROSS}-ranlib"
 if [ -z "${STRIP}" ]; then

ADDED   tcl/patchscripts/fix-crosscompile.sh
Index: tcl/patchscripts/fix-crosscompile.sh
==================================================================
--- /dev/null
+++ tcl/patchscripts/fix-crosscompile.sh
@@ -0,0 +1,145 @@
+#! /bin/bash
+
+case "${CC}" in
+	*-*-*)
+		;;
+	*)
+		exit 0
+		;;
+esac
+
+mkdir fake-bin
+
+cat << \_EOF_ > fake-bin/fake-uname
+#! /bin/bash
+
+if [ "$1" == "--fake" ]; then
+	echo "true"
+
+	exit 0
+fi
+
+case "${CC}" in
+	*-*-*)
+		;;
+	*)
+		CC=''
+		;;
+esac
+
+if [ -z "${CC}" ]; then
+	# If not cross compiling, revert to system uname
+	while [ "$(uname --fake 2>/dev/null)" == "true" -a -n "${PATH}" ]; do
+		PATH="$(echo "${PATH}" | sed 's@^[^:]*$@@;s@^[^:]*:@@')"
+
+		export PATH
+	done
+
+	if [ -z "${PATH}" ]; then
+		exit 1
+	fi
+
+	exec uname "$@"
+fi
+
+CROSS="$(echo "${CC}" | sed -r 's@-[^-]*($| .*$)@@')"
+
+# Determine release information
+case "${CROSS}" in
+	*-hpux11*)
+		sysname="HP-UX"
+		sysrelease="$(echo "${CROSS}" | sed 's@^.*-hpux@@')"
+		;;
+	*-solaris2*)
+		sysname="SunOS"
+		sysrelease="$(echo "${CROSS}" | sed 's@^.*-solaris@@;s@^2@5@')"
+		;;
+	*-linux*)
+		sysname="Linux"
+		sysrelease="2.6.5"
+		;;
+	*-netbsd*)
+		sysname="NetBSD"
+		sysrelease="$(echo "${CROSS}" | sed 's@^.*-netbsd@@;s@$@.0@')"
+		;;
+	*-freebsd*)
+		sysname="FreeBSD"
+		sysrelease="$(echo "${CROSS}" | sed 's@^.*-freebsd@@;s@$@.0-RELEASE@')"
+		;;
+	*-aix[0-9].*)
+		sysname="AIX"
+		sysrelease="$(echo "${CROSS}" | sed 's@.*-aix\([0-9]\..*\)@\1@')"
+		;;
+esac
+
+# Determine machine information
+case "${CROSS}" in
+	hppa64-*-hpux*)
+		sysmachine="9000/859"
+		;;
+	i386-*-solaris*)
+		sysmachine="i86pc"
+		;;
+	sparc-*-solaris*)
+		sysmachine="sun4u"
+		;;
+	x86_64-*)
+		sysmachine="x86_64"
+		;;
+	i?86-*)
+		sysmachine="i686"
+		;;
+	ia64-*)
+		sysmachine="ia64"
+		;;
+	arm-*|armel-*|armeb-*)
+		sysmachine="armv7l"
+		;;
+	mipsel-*|mipseb-*)
+		sysmachine="mips"
+		;;
+	powerpc-*)
+		sysmachine="ppc"
+		;;
+esac
+
+for arg in $(echo "$@" | sed 's@.@ & @g'); do
+	case "${arg}" in
+		-)
+			continue
+			;;
+		v)
+			retval="${retval} unknown"
+			;;
+		r)
+			retval="${retval} ${sysrelease}"
+			;;
+		s)
+			retval="${retval} ${sysname}"
+			;;
+		m)
+			retval="${retval} ${sysmachine}"
+			;;
+		p)
+			# XXX
+			retval="${retval} ${syscpu}"
+			;;
+		n)
+			retval="${retval} $(hostname)"
+			;;
+		a)
+			retval="${sysname} $(hostname) ${sysrelease} ${sysversion} ${sysmachine} ${syscpu}"
+			;;
+	esac
+done
+
+echo "${retval}" | sed 's@^  *@@;s@  *$@@'
+_EOF_
+
+chmod +x fake-bin/fake-uname
+
+sed 's|`uname |`'"$(pwd)"'/fake-bin/fake-uname |g' "${TCLPRIVATE}/unix/configure" > "${TCLPRIVATE}/unix/configure.new"
+cat "${TCLPRIVATE}/unix/configure.new" > "${TCLPRIVATE}/unix/configure"
+rm -f "${TCLPRIVATE}/unix/configure.new"
+
+exit 0