Index: build/make-kit-crosscompile
==================================================================
--- build/make-kit-crosscompile
+++ build/make-kit-crosscompile
@@ -4,14 +4,17 @@
 	echo 'Error: Environment variable CROSS is empty/unset.  Aborting.' >&2
 
 	exit 1
 fi
 
-PATH="$(pwd)/build/fake-bin:${HOME}/root/cross-compilers/${CROSS}/${CROSS}/bin:${PATH}:${HOME}/root/cross-compilers/${CROSS}/bin"
-AR="${CROSS}-ar"
-CC="${CROSS}-gcc ${CC_ADD}"
-CXX="${CROSS}-g++ ${CC_ADD}"
-RANLIB="${CROSS}-ranlib"
-STRIP="${CROSS}-strip"
+CCROOT="${HOME}/root/cross-compilers/${CROSS}"
+CCROOTBIN="${CCROOT}/bin"
+
+PATH="$(pwd)/build/fake-bin:${CCROOT}/${CROSS}/bin:${PATH}:${CCROOTBIN}"
+AR="${CCROOTBIN}/${CROSS}-ar"
+CC="${CCROOTBIN}/${CROSS}-gcc ${CC_ADD}"
+CXX="${CCROOTBIN}/${CROSS}-g++ ${CC_ADD}"
+RANLIB="${CCROOTBIN}/${CROSS}-ranlib"
+STRIP="${CCROOTBIN}/${CROSS}-strip"
 export PATH AR CC CXX RANLIB STRIP
 
 ./kitcreator "$@" --host="${CROSS}"

Index: build/test/test
==================================================================
--- build/test/test
+++ build/test/test
@@ -65,11 +65,11 @@
 )"
 DISPLAY=:31
 export DISPLAY
 
 failed=""
-for kit in normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll linux-mipsel-min linux-mipsel-min-kitdll linux-amd64-notk linux-amd64-notk-kitdll solaris-i386 solaris-i386-kitdll solaris-amd64 solaris-amd64-kitdll solaris-sparc solaris-sparc-kitdll solaris-sparc64 solaris-sparc64-kitdll hpux-hppa64-notk hpux-hppa64-notk-kitdll freebsd-amd64 freebsd-amd64-kitdll netbsd-i386 netbsd-i386-kitdll netbsd-amd64 netbsd-amd64-kitdll; do
+for kit in normal normal-zip normal-threaded normal-threaded-zip normal-statictk normal-notk normal-threaded-notk normal-threaded-zip-notk normal-nomk4 min min-static normal-kitdll normal-threaded-kitdll normal-notk-kitdll normal-nomk4-kitdll normal-nomk4-notk-kitdll normal-threaded-nomk4-kitdll normal-threaded-notk-nomk4-kitdll min-kitdll win32-i586 win32-i586-zip win32-i586-threaded win32-i586-threaded-zip win32-i586-notk win32-i586-threaded-notk win32-i586-nomk4 win32-i586-kitdll win32-i586-threaded-kitdll win32-i586-notk-kitdll win32-i586-nomk4-kitdll win32-i586-nomk4-notk-kitdll win32-i586-threaded-nomk4-kitdll win32-i586-threaded-notk-nomk4-kitdll linux-mipsel-min linux-mipsel-min-kitdll linux-amd64-notk linux-amd64-notk-kitdll solaris-i386 solaris-i386-kitdll solaris-amd64 solaris-amd64-kitdll solaris-sparc solaris-sparc-kitdll solaris-sparc64 solaris-sparc64-kitdll hpux-hppa64-notk hpux-hppa64-notk-kitdll freebsd-amd64 freebsd-amd64-kitdll netbsd-i386-notk netbsd-i386-notk-kitdll netbsd-amd64 netbsd-amd64-kitdll; do
 	kitcreator="./kitcreator"
 	args=""
 	runnable="1"
 	iszip="0"
 	statictk="0"