summaryrefslogtreecommitdiff
path: root/scripts/functions
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-10-23 13:45:48 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-10-23 13:45:48 (GMT)
commit1c625d676cb8703fbf8956bc87d90bf5cdf21d89 (patch)
tree2f8c3bd3c0a883a90414fb8a1f465ccbae5d104d /scripts/functions
parent58e57f180c46d4ad470d63b3a6033af3a395dabd (diff)
Push the calculation of the tuple's kernel part down to kernel's build scripts:
- update the kernel script's API with the function CT_DiKernelTupleValues - update doc accordingly (also with the architecture change, missing in the previous commit) - small clean-up in the main script, remove useless test /trunk/scripts/build/kernel/bare-metal.sh | 5 5 0 0 +++++ /trunk/scripts/build/kernel/linux.sh | 5 5 0 0 +++++ /trunk/scripts/crosstool.sh | 31 13 18 0 +++++++++++++------------------ /trunk/scripts/functions | 15 8 7 0 ++++++++------- /trunk/docs/overview.txt | 13 9 4 0 +++++++++---- 5 files changed, 40 insertions(+), 29 deletions(-)
Diffstat (limited to 'scripts/functions')
-rw-r--r--scripts/functions15
1 files changed, 8 insertions, 7 deletions
diff --git a/scripts/functions b/scripts/functions
index f14cc27..d69d549 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -674,6 +674,9 @@ CT_DoBuildTargetTuple() {
;;
esac
+ # Build the default architecture tuple part
+ CT_TARGET_ARCH="${CT_ARCH}"
+
# Set defaults for the system part of the tuple. Can be overriden
# by architecture-specific values.
case "${CT_LIBC}" in
@@ -695,17 +698,15 @@ 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
+ # Build the default kernel tuple part
+ CT_TARGET_KERNEL="${CT_KERNEL}"
- # Call the architecture specific settings
+ # Overide the default values with the components specific settings
CT_DoArchTupleValues
+ CT_DoKernelTupleValues
# Finish the target tuple construction
- CT_TARGET=$(CT_DoConfigSub "${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_SYS}")
+ CT_TARGET=$(CT_DoConfigSub "${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_KERNEL:+-}${CT_TARGET_SYS}")
# Prepare the target CFLAGS
CT_ARCH_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_ARCH_ENDIAN_CFLAG}"