diff options
Diffstat (limited to 'scripts/build')
| -rw-r--r-- | scripts/build/binutils/binutils.sh | 2 | ||||
| -rw-r--r-- | scripts/build/binutils/elf2flt.sh | 2 | ||||
| -rw-r--r-- | scripts/build/cc/gcc.sh | 4 | ||||
| -rw-r--r-- | scripts/build/libc/glibc-eglibc.sh-common | 11 |
4 files changed, 10 insertions, 9 deletions
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, |