summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-01-07 22:05:30 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-01-07 22:05:30 (GMT)
commita272b32bbaa71d0b4c70e289a562843d451e8791 (patch)
tree11b836a02c43b3a44bbd6a7b62947641229b5686
parent89eca789ce366ed5b3e74807329198dd090743db (diff)
config: don't force the vendor part in the tuple
Note however that some configurations (eg. arm-elf) will still have the vendor part 'unknown' forced in (by config.sub).
-rw-r--r--config/toolchain.in2
-rw-r--r--scripts/functions6
2 files changed, 5 insertions, 3 deletions
diff --git a/config/toolchain.in b/config/toolchain.in
index 4039d9d..c3d0351 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -42,7 +42,7 @@ config TARGET_VENDOR
Use a single word, or use underscores "_" to separate words.
Use neither dash nor space, as it breaks things.
- Keep the default (unkown) if you don't know better.
+ Keep the default (unknown) if you don't know better.
config TARGET_ALIAS_SED_EXPR
string
diff --git a/scripts/functions b/scripts/functions
index c8fec30..c7b1047 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -759,7 +759,10 @@ CT_DoBuildTargetTuple() {
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 @@ CT_DoBuildTargetTuple() {
# 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}"