scripts: interpret *_EXTRA_CONFIG config variables arrays
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun May 15 18:51:40 2011 +0200 (2011-05-15)
changeset 2466b7df125a1c78
parent 2462 139b85d70b62
child 2467 200836977ce6
scripts: interpret *_EXTRA_CONFIG config variables arrays

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
scripts/build/binutils/binutils.sh
scripts/build/binutils/elf2flt.sh
scripts/build/cc/gcc.sh
scripts/build/libc/glibc-eglibc.sh-common
     1.1 --- a/scripts/build/binutils/binutils.sh	Thu May 19 23:09:43 2011 +0200
     1.2 +++ b/scripts/build/binutils/binutils.sh	Sun May 15 18:51:40 2011 +0200
     1.3 @@ -70,8 +70,8 @@
     1.4          --disable-werror                                        \
     1.5          "${extra_config[@]}"                                    \
     1.6          ${CT_ARCH_WITH_FLOAT}                                   \
     1.7 -        ${CT_BINUTILS_EXTRA_CONFIG}                             \
     1.8 -        ${BINUTILS_SYSROOT_ARG}
     1.9 +        ${BINUTILS_SYSROOT_ARG}                                 \
    1.10 +        "${CT_BINUTILS_EXTRA_CONFIG[@]}"
    1.11  
    1.12      if [ "${CT_STATIC_TOOLCHAIN}" = "y" ]; then
    1.13          extra_make_flags+=("LDFLAGS=-all-static")
    1.14 @@ -154,7 +154,7 @@
    1.15              --disable-multilib                                      \
    1.16              "${extra_config[@]}"                                    \
    1.17              ${CT_ARCH_WITH_FLOAT}                                   \
    1.18 -            ${CT_BINUTILS_EXTRA_CONFIG}
    1.19 +            "${CT_BINUTILS_EXTRA_CONFIG[@]}"
    1.20  
    1.21          CT_DoLog EXTRA "Building binutils' libraries (${targets[*]}) for target"
    1.22          CT_DoExecLog ALL make ${JOBSFLAGS} "${build_targets[@]}"
     2.1 --- a/scripts/build/binutils/elf2flt.sh	Thu May 19 23:09:43 2011 +0200
     2.2 +++ b/scripts/build/binutils/elf2flt.sh	Sun May 15 18:51:40 2011 +0200
     2.3 @@ -49,7 +49,7 @@
     2.4          --with-libbfd=${binutils_bld}/bfd/libbfd.a              \
     2.5          --with-libiberty=${binutils_bld}/libiberty/libiberty.a  \
     2.6          ${elf2flt_opts}                                         \
     2.7 -        ${CT_ELF2FLT_EXTRA_CONFIG}
     2.8 +        "${CT_ELF2FLT_EXTRA_CONFIG[@]}"
     2.9  
    2.10      CT_DoLog EXTRA "Building elf2flt"
    2.11      CT_DoExecLog ALL make ${JOBSFLAGS}
     3.1 --- a/scripts/build/cc/gcc.sh	Thu May 19 23:09:43 2011 +0200
     3.2 +++ b/scripts/build/cc/gcc.sh	Sun May 15 18:51:40 2011 +0200
     3.3 @@ -276,7 +276,7 @@
     3.4          --disable-nls                               \
     3.5          --enable-symvers=gnu                        \
     3.6          --enable-languages="${lang_opt}"            \
     3.7 -        ${CT_CC_CORE_EXTRA_CONFIG}
     3.8 +        "${CT_CC_CORE_EXTRA_CONFIG[@]}"
     3.9  
    3.10      if [ "${build_libgcc}" = "yes" ]; then
    3.11          # HACK: we need to override SHLIB_LC from gcc/config/t-slibgcc-elf-ver or
    3.12 @@ -555,7 +555,7 @@
    3.13          --enable-symvers=gnu                        \
    3.14          --enable-c99                                \
    3.15          --enable-long-long                          \
    3.16 -        ${CT_CC_EXTRA_CONFIG}
    3.17 +        "${CT_CC_EXTRA_CONFIG[@]}"
    3.18  
    3.19      if [ "${CT_CANADIAN}" = "y" ]; then
    3.20          CT_DoLog EXTRA "Building libiberty"
     4.1 --- a/scripts/build/libc/glibc-eglibc.sh-common	Thu May 19 23:09:43 2011 +0200
     4.2 +++ b/scripts/build/libc/glibc-eglibc.sh-common	Sun May 15 18:51:40 2011 +0200
     4.3 @@ -159,7 +159,7 @@
     4.4          nptl)           extra_config+=("--with-__thread" "--with-tls");;
     4.5          linuxthreads)   extra_config+=("--with-__thread" "--without-tls" "--without-nptl");;
     4.6          none)           extra_config+=("--without-__thread" "--without-nptl")
     4.7 -                        case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in
     4.8 +                        case "${CT_LIBC_GLIBC_EXTRA_CONFIG[*]}" in
     4.9                              *-tls*) ;;
    4.10                              *) extra_config+=("--without-tls");;
    4.11                          esac
    4.12 @@ -250,7 +250,7 @@
    4.13          --without-gd                                                \
    4.14          --with-headers="${CT_HEADERS_DIR}"                          \
    4.15          "${extra_config[@]}"                                        \
    4.16 -        ${CT_LIBC_GLIBC_EXTRA_CONFIG}
    4.17 +        "${CT_LIBC_GLIBC_EXTRA_CONFIG[@]}"
    4.18      
    4.19      # build hacks
    4.20      case "${CT_ARCH},${CT_ARCH_CPU}" in
    4.21 @@ -300,7 +300,7 @@
    4.22  do_libc_min_kernel_config() {
    4.23      local min_kernel_config
    4.24  
    4.25 -    case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in
    4.26 +    case "${CT_LIBC_GLIBC_EXTRA_CONFIG[*]}" in
    4.27          *--enable-kernel*) ;;
    4.28          *)  if [ "${CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS}" = "y" ]; then
    4.29                  # We can't rely on the kernel version from the configuration,