config: rename variables that are arrays

Make it explicit that a variable is an array bu the name of the variable.
It will be used later when .config gets munged to allow both multiple
arguments and arguments with spaces at the same time to be passed from the
configuration down to the build scripts.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

10 files changed, 21 insertions, 20 deletions

diff --git a/config/arch/powerpc.in.2 b/config/arch/powerpc.in.2
index 1c44f51..292bca5 100644
--- a/config/arch/powerpc.in.2
+++ b/config/arch/powerpc.in.2
@@ -11,7 +11,7 @@ config ARCH_POWERPC_SPE
       
       Setting this option will append "spe" to the end of your target
       tuple name (e.g., powerpc-e500v2-linux-gnuspe) so that the gcc
-      configure/build system will know to include SPE ABI support.
-      It will also automatically add "-mabi=spe -mspe" to your
-      TARGET_CFLAGS, and "--enable-e500_double" to your CC_EXTRA_CONFIG,
-      so you do not need to explicitly add them.
+      configure/build system will know to include SPE ABI support. It
+      will also automatically add "-mabi=spe -mspe" to your TARGET_CFLAGS,
+      and "--enable-e500_double" to your CC_EXTRA_CONFIG_ARRAY, so you
+      do not need to explicitly add them.
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 425fb04..360316f 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -195,7 +195,7 @@ config BINUTILS_PLUGINS
       Especially, gold can use the lto-plugin, as installed
       by gcc, to handle LTO.
 
-config BINUTILS_EXTRA_CONFIG
+config BINUTILS_EXTRA_CONFIG_ARRAY
     string
     prompt "binutils extra config"
     default ""
diff --git a/config/binutils/elf2flt.in b/config/binutils/elf2flt.in
index 4f95ec7..9ff4a4b 100644
--- a/config/binutils/elf2flt.in
+++ b/config/binutils/elf2flt.in
@@ -37,7 +37,7 @@ config ELF2FLT_VERSION
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
 
-config ELF2FLT_EXTRA_CONFIG
+config ELF2FLT_EXTRA_CONFIG_ARRAY
     string
     prompt "elf2flt extra config"
     default ""
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index a181257..418371c 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -31,7 +31,7 @@ config CC_ENABLE_CXX_FLAGS
       Note: just pass in the option _value_, that is only the part that goes
       after the '=' sign.
 
-config CC_CORE_EXTRA_CONFIG
+config CC_CORE_EXTRA_CONFIG_ARRAY
     string
     prompt "Core gcc extra config"
     default ""
@@ -41,7 +41,7 @@ config CC_CORE_EXTRA_CONFIG
       The core gcc is a stripped down, C-only compiler needed to build
       the C library. Kinda bootstrap gcc, if you wish.
 
-config CC_EXTRA_CONFIG
+config CC_EXTRA_CONFIG_ARRAY
     string
     prompt "gcc extra config"
     default ""
diff --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common
index f3310a7..b8d3b56 100644
--- a/config/libc/glibc-eglibc.in-common
+++ b/config/libc/glibc-eglibc.in-common
@@ -16,7 +16,7 @@ config LIBC_glibc_familly
     default y
     select BINUTILS_FORCE_LD_BFD
 
-config LIBC_GLIBC_EXTRA_CONFIG
+config LIBC_GLIBC_EXTRA_CONFIG_ARRAY
     string
     prompt "extra config"
     default ""
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index c60b806..a44899d 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -71,7 +71,7 @@ do_binutils() {
         "${extra_config[@]}"                                    \
         ${CT_ARCH_WITH_FLOAT}                                   \
         ${BINUTILS_SYSROOT_ARG}                                 \
-        "${CT_BINUTILS_EXTRA_CONFIG[@]}"
+        "${CT_BINUTILS_EXTRA_CONFIG_ARRAY[@]}"
 
     if [ "${CT_STATIC_TOOLCHAIN}" = "y" ]; then
         extra_make_flags+=("LDFLAGS=-all-static")
diff --git a/scripts/build/binutils/elf2flt.sh b/scripts/build/binutils/elf2flt.sh
index cb3c5d0..82e219e 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_ARRAY[@]}"
 
     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 33b2c15..b7db77e 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_ARRAY[@]}"
 
     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_ARRAY[@]}"
 
     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 bdab900..f200ef5 100644
--- a/scripts/build/libc/glibc-eglibc.sh-common
+++ b/scripts/build/libc/glibc-eglibc.sh-common
@@ -151,7 +151,8 @@ do_libc() {
 
     # Add some default glibc config options if not given by user.
     # We don't need to be conditional on wether the user did set different
-    # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG is passed after extra_config
+    # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY is passed after
+    # extra_config
 
     extra_config+=("$(do_libc_min_kernel_config)")
 
@@ -159,7 +160,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_ARRAY[*]}" in
                             *-tls*) ;;
                             *) extra_config+=("--without-tls");;
                         esac
@@ -228,7 +229,7 @@ do_libc() {
 
     # Configure with --prefix the way we want it on the target...
     # There are a whole lot of settings here.  You'll probably want
-    # to read up on what they all mean, and customize a bit, possibly by setting GLIBC_EXTRA_CONFIG
+    # to read up on what they all mean, and customize a bit, possibly by setting GLIBC_EXTRA_CONFIG_ARRAY
     # Compare these options with the ones used when installing the glibc headers above - they're different.
     # Adding "--without-gd" option to avoid error "memusagestat.c:36:16: gd.h: No such file or directory"
     # See also http://sources.redhat.com/ml/libc-alpha/2000-07/msg00024.html.
@@ -250,7 +251,7 @@ do_libc() {
         --without-gd                                                \
         --with-headers="${CT_HEADERS_DIR}"                          \
         "${extra_config[@]}"                                        \
-        "${CT_LIBC_GLIBC_EXTRA_CONFIG[@]}"
+        "${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[@]}"
     
     # build hacks
     case "${CT_ARCH},${CT_ARCH_CPU}" in
@@ -300,7 +301,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_ARRAY[*]}" in
         *--enable-kernel*) ;;
         *)  if [ "${CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS}" = "y" ]; then
                 # We can't rely on the kernel version from the configuration,
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index a3869c1..648ff45 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -148,8 +148,8 @@ CT_TestAndAbort "'CT_PREFIX_DIR' is not set: where should I install?" -z "${CT_P
 # Put user-supplied flags at the end, so that they take precedence.
 CT_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_TARGET_CFLAGS}"
 CT_TARGET_LDFLAGS="${CT_ARCH_TARGET_LDFLAGS} ${CT_TARGET_LDFLAGS}"
-CT_CC_CORE_EXTRA_CONFIG="${CT_ARCH_CC_CORE_EXTRA_CONFIG} ${CT_CC_CORE_EXTRA_CONFIG}"
-CT_CC_EXTRA_CONFIG="${CT_ARCH_CC_EXTRA_CONFIG} ${CT_CC_EXTRA_CONFIG}"
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=( ${CT_ARCH_CC_CORE_EXTRA_CONFIG} "${CT_CC_CORE_EXTRA_CONFIG_ARRAY[@]}" )
+CT_CC_EXTRA_CONFIG_ARRAY=( ${CT_ARCH_CC_EXTRA_CONFIG} "${CT_CC_EXTRA_CONFIG_ARRAY[@]}" )
 
 # Compute the working directories names
 CT_TARBALLS_DIR="${CT_WORK_DIR}/tarballs"