[PATCH 1 of 4] scripts: interpret *_EXTRA_CONFIG config variables arrays
Yann E. MORIN
yann.morin.1998@anciens.enib.fr
Wed May 18 22:14:00 GMT 2011
# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1305478300 -7200
# Node ID 342d3ad6a835e3bb7d9b8150ffbbfade9b2faeb9
# Parent c70da6c50bdb08a8b3cbe5c83aa9ed0973a4ab6c
scripts: interpret *_EXTRA_CONFIG config variables arrays
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -70,8 +70,8 @@
--disable-werror \
"${extra_config[@]}" \
${CT_ARCH_WITH_FLOAT} \
- ${CT_BINUTILS_EXTRA_CONFIG} \
- ${BINUTILS_SYSROOT_ARG}
+ ${BINUTILS_SYSROOT_ARG} \
+ "${CT_BINUTILS_EXTRA_CONFIG[@]}"
if [ "${CT_STATIC_TOOLCHAIN}" = "y" ]; then
extra_make_flags+=("LDFLAGS=-all-static")
@@ -154,7 +154,7 @@
--disable-multilib \
"${extra_config[@]}" \
${CT_ARCH_WITH_FLOAT} \
- ${CT_BINUTILS_EXTRA_CONFIG}
+ "${CT_BINUTILS_EXTRA_CONFIG[@]}"
CT_DoLog EXTRA "Building binutils' libraries (${targets[*]}) for target"
CT_DoExecLog ALL make ${JOBSFLAGS} "${build_targets[@]}"
diff --git a/scripts/build/binutils/elf2flt.sh b/scripts/build/binutils/elf2flt.sh
--- a/scripts/build/binutils/elf2flt.sh
+++ b/scripts/build/binutils/elf2flt.sh
@@ -49,7 +49,7 @@
--with-libbfd=${binutils_bld}/bfd/libbfd.a \
--with-libiberty=${binutils_bld}/libiberty/libiberty.a \
${elf2flt_opts} \
- ${CT_ELF2FLT_EXTRA_CONFIG}
+ "${CT_ELF2FLT_EXTRA_CONFIG[@]}"
CT_DoLog EXTRA "Building elf2flt"
CT_DoExecLog ALL make ${JOBSFLAGS}
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -276,7 +276,7 @@
--disable-nls \
--enable-symvers=gnu \
--enable-languages="${lang_opt}" \
- ${CT_CC_CORE_EXTRA_CONFIG}
+ "${CT_CC_CORE_EXTRA_CONFIG[@]}"
if [ "${build_libgcc}" = "yes" ]; then
# HACK: we need to override SHLIB_LC from gcc/config/t-slibgcc-elf-ver or
@@ -555,7 +555,7 @@
--enable-symvers=gnu \
--enable-c99 \
--enable-long-long \
- ${CT_CC_EXTRA_CONFIG}
+ "${CT_CC_EXTRA_CONFIG[@]}"
if [ "${CT_CANADIAN}" = "y" ]; then
CT_DoLog EXTRA "Building libiberty"
diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common
--- a/scripts/build/libc/glibc-eglibc.sh-common
+++ b/scripts/build/libc/glibc-eglibc.sh-common
@@ -159,7 +159,7 @@
nptl) extra_config+=("--with-__thread" "--with-tls");;
linuxthreads) extra_config+=("--with-__thread" "--without-tls" "--without-nptl");;
none) extra_config+=("--without-__thread" "--without-nptl")
- case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in
+ case "${CT_LIBC_GLIBC_EXTRA_CONFIG[*]}" in
*-tls*) ;;
*) extra_config+=("--without-tls");;
esac
@@ -250,7 +250,7 @@
--without-gd \
--with-headers="${CT_HEADERS_DIR}" \
"${extra_config[@]}" \
- ${CT_LIBC_GLIBC_EXTRA_CONFIG}
+ "${CT_LIBC_GLIBC_EXTRA_CONFIG[@]}"
# build hacks
case "${CT_ARCH},${CT_ARCH_CPU}" in
@@ -300,7 +300,7 @@
do_libc_min_kernel_config() {
local min_kernel_config
- case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in
+ case "${CT_LIBC_GLIBC_EXTRA_CONFIG[*]}" in
*--enable-kernel*) ;;
*) if [ "${CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS}" = "y" ]; then
# We can't rely on the kernel version from the configuration,
--
For unsubscribe information see http://sourceware.org/lists.html#faq
More information about the crossgcc
mailing list