diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/kernel/linux.sh | 4 | ||||
| -rw-r--r-- | scripts/build/libc/glibc.sh | 4 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 11 | ||||
| -rw-r--r-- | scripts/functions | 3 |
4 files changed, 13 insertions, 9 deletions
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index c545e7b..626086e 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -59,7 +59,7 @@ do_kernel_install() { CT_DoExecLog ALL \ make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" \ O=$(pwd) \ - ARCH=${CT_KERNEL_ARCH} \ + ARCH=${CT_ARCH} \ INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \ ${V_OPT} \ headers_install @@ -69,7 +69,7 @@ do_kernel_install() { CT_DoExecLog ALL \ make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" \ O=$(pwd) \ - ARCH=${CT_KERNEL_ARCH} \ + ARCH=${CT_ARCH} \ INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr" \ ${V_OPT} \ headers_check diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index 8f28918..264c75f 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -115,10 +115,10 @@ do_libc_headers() { CT_DoLog EXTRA "Configuring C library" # The x86 arch needs special care... Bizarelly enough... :-( - case "${CT_KERNEL_ARCH}:${CT_ARCH_BITNESS}" in + case "${CT_ARCH}:${CT_ARCH_BITNESS}" in x86:32) arch4hdrs="i386";; x86:64) arch4hdrs="x86_64";; - *) arch4hdrs="${CT_KERNEL_ARCH}";; + *) arch4hdrs="${CT_ARCH}";; esac # The following three things have to be done to build glibc-2.3.x, but they don't hurt older versions. diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index 3dcc111..0d4775e 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -189,12 +189,19 @@ mungeuClibcConfig() { ( # Hack our target in the config file. + case "${CT_ARCH}:${CT_ARCH_BITNESS}" in + x86:32) arch=i386;; + x86:64) arch=x86_64;; + sh:32) arch="sh";; + sh:64) arch="sh64";; + *) arch="${CT_ARCH}";; + esac # Also remove stripping: its the responsibility of the # firmware builder to strip or not. cat <<-ENDSED s/^(TARGET_.*)=y$/# \\1 is not set/ - s/^# TARGET_${CT_KERNEL_ARCH} is not set/TARGET_${CT_KERNEL_ARCH}=y/ - s/^TARGET_ARCH=".*"/TARGET_ARCH="${CT_KERNEL_ARCH}"/ + s/^# TARGET_${arch} is not set/TARGET_${arch}=y/ + s/^TARGET_ARCH=".*"/TARGET_ARCH="${arch}"/ s/.*(DOSTRIP).*/# \\1 is not set/ ENDSED diff --git a/scripts/functions b/scripts/functions index 470a592..6477eff 100644 --- a/scripts/functions +++ b/scripts/functions @@ -738,9 +738,6 @@ CT_DoBuildTargetTuple() { *) CT_TARGET_SYS=elf;; esac - # Transform the ARCH into a kernel-understandable ARCH - CT_KERNEL_ARCH="${CT_ARCH}" - # Set the default values for ARCH, ABI, CPU, TUNE, FPU and FLOAT unset CT_ARCH_ARCH_CFLAG CT_ARCH_ABI_CFLAG CT_ARCH_CPU_CFLAG CT_ARCH_TUNE_CFLAG CT_ARCH_FPU_CFLAG CT_ARCH_FLOAT_CFLAG unset CT_ARCH_WITH_ARCH CT_ARCH_WITH_ABI CT_ARCH_WITH_CPU CT_ARCH_WITH_TUNE CT_ARCH_WITH_FPU CT_ARCH_WITH_FLOAT |