diff options
| -rw-r--r-- | scripts/build/libc_uClibc.sh | 4 | ||||
| -rw-r--r-- | scripts/functions | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/libc_uClibc.sh b/scripts/build/libc_uClibc.sh index d4cb416..1add33f 100644 --- a/scripts/build/libc_uClibc.sh +++ b/scripts/build/libc_uClibc.sh @@ -201,12 +201,12 @@ ENDSED # way to select between hard/soft float has changed case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in y,) cat >>"${munge_file}" <<-ENDSED -s/[^_]*(HAS_FPU).*/\\1=y/ +s/^[^_]*(HAS_FPU).*/\\1=y/ s/.*(UCLIBC_HAS_FPU).*/\\1=y/ ENDSED ;; ,y) cat >>"${munge_file}" <<-ENDSED -s/[^_]*(HAS_FPU).*/\\# \\1 is not set/ +s/^[^_]*(HAS_FPU).*/\\# \\1 is not set/ s/.*(UCLIBC_HAS_FPU).*/# \\1 is not set/ ENDSED ;; diff --git a/scripts/functions b/scripts/functions index c4f739a..13fa159 100644 --- a/scripts/functions +++ b/scripts/functions @@ -517,8 +517,8 @@ CT_DoBuildTargetTuple() { 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 - unset CT_ARCH_WITH_ARCH CT_ARCH_WITH_ABI CT_ARCH_WITH_CPU CT_ARCH_WITH_TUNE CT_ARCH_WITH_FPU + 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 [ "${CT_ARCH_ARCH}" ] && { CT_ARCH_ARCH_CFLAG="-march=${CT_ARCH_ARCH}"; CT_ARCH_WITH_ARCH="--with-arch=${CT_ARCH_ARCH}"; } [ "${CT_ARCH_ABI}" ] && { CT_ARCH_ABI_CFLAG="-mabi=${CT_ARCH_ABI}"; CT_ARCH_WITH_ABI="--with-abi=${CT_ARCH_ABI}"; } [ "${CT_ARCH_CPU}" ] && { CT_ARCH_CPU_CFLAG="-mcpu=${CT_ARCH_CPU}"; CT_ARCH_WITH_CPU="--with-cpu=${CT_ARCH_CPU}"; } |