1.1 --- a/scripts/build/libc/glibc-eglibc.sh-common	Sun May 15 18:51:40 2011 +0200
     1.2 +++ b/scripts/build/libc/glibc-eglibc.sh-common	Wed May 18 23:00:46 2011 +0200
     1.3 @@ -151,7 +151,8 @@
     1.4  
     1.5      # Add some default glibc config options if not given by user.
     1.6      # We don't need to be conditional on wether the user did set different
     1.7 -    # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG is passed after extra_config
     1.8 +    # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY is passed after
     1.9 +    # extra_config
    1.10  
    1.11      extra_config+=("$(do_libc_min_kernel_config)")
    1.12  
    1.13 @@ -159,7 +160,7 @@
    1.14          nptl)           extra_config+=("--with-__thread" "--with-tls");;
    1.15          linuxthreads)   extra_config+=("--with-__thread" "--without-tls" "--without-nptl");;
    1.16          none)           extra_config+=("--without-__thread" "--without-nptl")
    1.17 -                        case "${CT_LIBC_GLIBC_EXTRA_CONFIG[*]}" in
    1.18 +                        case "${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[*]}" in
    1.19                              *-tls*) ;;
    1.20                              *) extra_config+=("--without-tls");;
    1.21                          esac
    1.22 @@ -228,7 +229,7 @@
    1.23  
    1.24      # Configure with --prefix the way we want it on the target...
    1.25      # There are a whole lot of settings here.  You'll probably want
    1.26 -    # to read up on what they all mean, and customize a bit, possibly by setting GLIBC_EXTRA_CONFIG
    1.27 +    # to read up on what they all mean, and customize a bit, possibly by setting GLIBC_EXTRA_CONFIG_ARRAY
    1.28      # Compare these options with the ones used when installing the glibc headers above - they're different.
    1.29      # Adding "--without-gd" option to avoid error "memusagestat.c:36:16: gd.h: No such file or directory"
    1.30      # See also http://sources.redhat.com/ml/libc-alpha/2000-07/msg00024.html.
    1.31 @@ -250,7 +251,7 @@
    1.32          --without-gd                                                \
    1.33          --with-headers="${CT_HEADERS_DIR}"                          \
    1.34          "${extra_config[@]}"                                        \
    1.35 -        "${CT_LIBC_GLIBC_EXTRA_CONFIG[@]}"
    1.36 +        "${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[@]}"
    1.37      
    1.38      # build hacks
    1.39      case "${CT_ARCH},${CT_ARCH_CPU}" in
    1.40 @@ -300,7 +301,7 @@
    1.41  do_libc_min_kernel_config() {
    1.42      local min_kernel_config
    1.43  
    1.44 -    case "${CT_LIBC_GLIBC_EXTRA_CONFIG[*]}" in
    1.45 +    case "${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[*]}" in
    1.46          *--enable-kernel*) ;;
    1.47          *)  if [ "${CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS}" = "y" ]; then
    1.48                  # We can't rely on the kernel version from the configuration,