summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-05-15 16:51:40 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-05-15 16:51:40 (GMT)
commitb00e501d7c77db553d81cb98fe2d0c3f29e652d4 (patch)
tree2a9a20b1218e0cfbadba5ff771329239caecc70d
parente109ca92a0df15421fa57c47092a8b53ce069c9f (diff)
scripts: interpret *_EXTRA_CONFIG config variables arrays
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-rw-r--r--scripts/build/binutils/binutils.sh6
-rw-r--r--scripts/build/binutils/elf2flt.sh2
-rw-r--r--scripts/build/cc/gcc.sh4
-rw-r--r--scripts/build/libc/glibc-eglibc.sh-common6
4 files changed, 9 insertions, 9 deletions
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index dc8f81e..c60b806 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -70,8 +70,8 @@ do_binutils() {
--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 @@ do_binutils_target() {
--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
index d9aaef1..cb3c5d0 100644
--- a/scripts/build/binutils/elf2flt.sh
+++ b/scripts/build/binutils/elf2flt.sh
@@ -49,7 +49,7 @@ do_elf2flt() {
--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
index ce393ee..33b2c15 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -276,7 +276,7 @@ do_cc_core() {
--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 @@ do_cc() {
--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
index d2b6563..bdab900 100644
--- a/scripts/build/libc/glibc-eglibc.sh-common
+++ b/scripts/build/libc/glibc-eglibc.sh-common
@@ -159,7 +159,7 @@ do_libc() {
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 @@ do_libc() {
--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_add_ons_list() {
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,