9 files changed, 15 insertions, 13 deletions
diff --git a/scripts/build/arch/alpha.sh b/scripts/build/arch/alpha.sh
index ea8ef536..e0fc7c2a 100644
--- a/scripts/build/arch/alpha.sh
+++ b/scripts/build/arch/alpha.sh
@@ -1,6 +1,6 @@
 # Compute Alpha-specific values
 
-CT_DoArchValues () {
+CT_DoArchTupleValues () {
     # The architecture part of the tuple:
     CT_TARGET_ARCH="${CT_ARCH}${CT_ARCH_ALPHA_VARIANT}"
 
diff --git a/scripts/build/arch/arm.sh b/scripts/build/arch/arm.sh
index a1b8542c..fafd8715 100644
--- a/scripts/build/arch/arm.sh
+++ b/scripts/build/arch/arm.sh
@@ -1,6 +1,6 @@
 # Compute ARM-specific values
 
-CT_DoArchValues() {
+CT_DoArchTupleValues() {
     # The architecture part of the tuple:
     CT_TARGET_ARCH="${CT_ARCH}${target_endian_eb}"
 
diff --git a/scripts/build/arch/ia64.sh b/scripts/build/arch/ia64.sh
index 76f34ddb..f36f9dd0 100644
--- a/scripts/build/arch/ia64.sh
+++ b/scripts/build/arch/ia64.sh
@@ -1,6 +1,6 @@
 # Compute IA-64-specific values
 
-CT_DoArchValues() {
+CT_DoArchTupleValues() {
     # The architecture part of the tuple:
     CT_TARGET_ARCH="${CT_ARCH}"
 }
diff --git a/scripts/build/arch/mips.sh b/scripts/build/arch/mips.sh
index 4bf0501d..ae9e1112 100644
--- a/scripts/build/arch/mips.sh
+++ b/scripts/build/arch/mips.sh
@@ -1,6 +1,6 @@
 # Compute IA-64-specific values
 
-CT_DoArchValues() {
+CT_DoArchTupleValues() {
     # The architecture part of the tuple:
     CT_TARGET_ARCH="${CT_ARCH}${target_endian_el}"
 
diff --git a/scripts/build/arch/powerpc.sh b/scripts/build/arch/powerpc.sh
index 94ad11cd..edba61e4 100644
--- a/scripts/build/arch/powerpc.sh
+++ b/scripts/build/arch/powerpc.sh
@@ -1,6 +1,6 @@
 # Compute powerpc-specific values
 
-CT_DoArchValues () {
+CT_DoArchTupleValues () {
     # The architecture part of the tuple:
     CT_TARGET_ARCH="${CT_ARCH}"
 
diff --git a/scripts/build/arch/sh.sh b/scripts/build/arch/sh.sh
index b6dbc026..5af8d6a3 100644
--- a/scripts/build/arch/sh.sh
+++ b/scripts/build/arch/sh.sh
@@ -1,6 +1,6 @@
 # Compute sh-specific values
 
-CT_DoArchValues () {
+CT_DoArchTupleValues () {
     # The architecture part of the tuple:
     CT_TARGET_ARCH="${CT_ARCH_SH_VARIANT}${target_endian_eb}"
 
diff --git a/scripts/build/arch/x86.sh b/scripts/build/arch/x86.sh
index ae67692d..42a253a0 100644
--- a/scripts/build/arch/x86.sh
+++ b/scripts/build/arch/x86.sh
@@ -2,7 +2,7 @@
 
 # This one really need a little love! :-(
 
-CT_DoArchValues() {
+CT_DoArchTupleValues() {
     # The architecture part of the tuple:
     arch="${CT_ARCH_ARCH}"
     [ -z "${arch}" ] && arch="${CT_ARCH_TUNE}"
diff --git a/scripts/build/arch/x86_64.sh b/scripts/build/arch/x86_64.sh
index 2626abf6..1db07917 100644
--- a/scripts/build/arch/x86_64.sh
+++ b/scripts/build/arch/x86_64.sh
@@ -1,6 +1,6 @@
 # Compute x86_64-specific values
 
-CT_DoArchValues() {
+CT_DoArchTupleValues() {
     # The architecture part of the tuple:
     CT_TARGET_ARCH="${CT_ARCH}"
 }
diff --git a/scripts/functions b/scripts/functions
index c2d3675b..f14cc277 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -695,14 +695,16 @@ CT_DoBuildTargetTuple() {
     [ "${CT_ARCH_FPU}"      ] && { CT_ARCH_FPU_CFLAG="-mfpu=${CT_ARCH_FPU}";     CT_ARCH_WITH_FPU="--with-fpu=${CT_ARCH_FPU}";    }
     [ "${CT_ARCH_FLOAT_SW}" ] && { CT_ARCH_FLOAT_CFLAG="-msoft-float";           CT_ARCH_WITH_FLOAT="--with-float=soft";          }
 
+    # Build the kernel tuple part
+    case "${CT_KERNEL}" in
+        bare-metal) CT_TARGET_KERNEL=;;
+        linux)      CT_TARGET_KERNEL=linux-;;
+    esac
+
     # Call the architecture specific settings
-    CT_DoArchValues
+    CT_DoArchTupleValues
 
     # Finish the target tuple construction
-    case "${CT_KERNEL}" in
-        none)   CT_TARGET_KERNEL=;;
-        linux)  CT_TARGET_KERNEL=linux-;;
-    esac
     CT_TARGET=$(CT_DoConfigSub "${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_SYS}")
 
     # Prepare the target CFLAGS