# HG changeset patch # User "Yann E. MORIN" # Date 1305752446 -7200 # Node ID 200836977ce68895d218de351de7d2b0d04c532e # Parent b7df125a1c78de26487cb7d2eb6441870d50021f 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" diff -r b7df125a1c78 -r 200836977ce6 config/arch/powerpc.in.2 --- a/config/arch/powerpc.in.2 Sun May 15 18:51:40 2011 +0200 +++ b/config/arch/powerpc.in.2 Wed May 18 23:00:46 2011 +0200 @@ -11,7 +11,7 @@ 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 -r b7df125a1c78 -r 200836977ce6 config/binutils/binutils.in --- a/config/binutils/binutils.in Sun May 15 18:51:40 2011 +0200 +++ b/config/binutils/binutils.in Wed May 18 23:00:46 2011 +0200 @@ -195,7 +195,7 @@ 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 -r b7df125a1c78 -r 200836977ce6 config/binutils/elf2flt.in --- a/config/binutils/elf2flt.in Sun May 15 18:51:40 2011 +0200 +++ b/config/binutils/elf2flt.in Wed May 18 23:00:46 2011 +0200 @@ -37,7 +37,7 @@ # 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 -r b7df125a1c78 -r 200836977ce6 config/cc/gcc.in.2 --- a/config/cc/gcc.in.2 Sun May 15 18:51:40 2011 +0200 +++ b/config/cc/gcc.in.2 Wed May 18 23:00:46 2011 +0200 @@ -31,7 +31,7 @@ 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 @@ 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 -r b7df125a1c78 -r 200836977ce6 config/libc/glibc-eglibc.in-common --- a/config/libc/glibc-eglibc.in-common Sun May 15 18:51:40 2011 +0200 +++ b/config/libc/glibc-eglibc.in-common Wed May 18 23:00:46 2011 +0200 @@ -16,7 +16,7 @@ default y select BINUTILS_FORCE_LD_BFD -config LIBC_GLIBC_EXTRA_CONFIG +config LIBC_GLIBC_EXTRA_CONFIG_ARRAY string prompt "extra config" default "" diff -r b7df125a1c78 -r 200836977ce6 scripts/build/binutils/binutils.sh --- a/scripts/build/binutils/binutils.sh Sun May 15 18:51:40 2011 +0200 +++ b/scripts/build/binutils/binutils.sh Wed May 18 23:00:46 2011 +0200 @@ -71,7 +71,7 @@ "${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 -r b7df125a1c78 -r 200836977ce6 scripts/build/binutils/elf2flt.sh --- a/scripts/build/binutils/elf2flt.sh Sun May 15 18:51:40 2011 +0200 +++ b/scripts/build/binutils/elf2flt.sh Wed May 18 23:00:46 2011 +0200 @@ -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_ARRAY[@]}" CT_DoLog EXTRA "Building elf2flt" CT_DoExecLog ALL make ${JOBSFLAGS} diff -r b7df125a1c78 -r 200836977ce6 scripts/build/cc/gcc.sh --- a/scripts/build/cc/gcc.sh Sun May 15 18:51:40 2011 +0200 +++ b/scripts/build/cc/gcc.sh Wed May 18 23:00:46 2011 +0200 @@ -276,7 +276,7 @@ --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 @@ --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 -r b7df125a1c78 -r 200836977ce6 scripts/build/libc/glibc-eglibc.sh-common --- a/scripts/build/libc/glibc-eglibc.sh-common Sun May 15 18:51:40 2011 +0200 +++ b/scripts/build/libc/glibc-eglibc.sh-common Wed May 18 23:00:46 2011 +0200 @@ -151,7 +151,8 @@ # 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 @@ 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 @@ # 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 @@ --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_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 -r b7df125a1c78 -r 200836977ce6 scripts/crosstool-NG.sh.in --- a/scripts/crosstool-NG.sh.in Sun May 15 18:51:40 2011 +0200 +++ b/scripts/crosstool-NG.sh.in Wed May 18 23:00:46 2011 +0200 @@ -148,8 +148,8 @@ # 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"