diff -r e0191807e79a -r 6df0d71a7a55 scripts/functions
--- a/scripts/functions	Mon Nov 30 21:34:50 2009 +0100
+++ b/scripts/functions	Thu Jan 07 23:05:30 2010 +0100
@@ -759,7 +759,10 @@
     CT_DoKernelTupleValues
 
     # Finish the target tuple construction
-    CT_TARGET="${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_KERNEL:+-}${CT_TARGET_SYS}"
+    CT_TARGET="${CT_TARGET_ARCH}-"
+    CT_TARGET="${CT_TARGET}${CT_TARGET_VENDOR:+${CT_TARGET_VENDOR}-}"
+    CT_TARGET="${CT_TARGET}${CT_TARGET_KERNEL:+${CT_TARGET_KERNEL}-}"
+    CT_TARGET="${CT_TARGET}${CT_TARGET_SYS}"
 
     # Sanity checks
     __sed_alias=""
@@ -775,7 +778,6 @@
 
     # Canonicalise it
     CT_TARGET=$(CT_DoConfigSub "${CT_TARGET}")
-
     # Prepare the target CFLAGS
     CT_ARCH_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_ARCH_ENDIAN_CFLAG}"
     CT_ARCH_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_ARCH_ARCH_CFLAG}"