1.1 --- a/scripts/build/cc/gcc.sh	Wed Nov 23 23:27:12 2011 +0100
     1.2 +++ b/scripts/build/cc/gcc.sh	Wed Nov 23 23:51:07 2011 +0100
     1.3 @@ -297,6 +297,12 @@
     1.4          extra_config+=("--with-system-zlib")
     1.5      fi
     1.6  
     1.7 +    if [ "${CT_MULTILIB}" = "y" ]; then
     1.8 +        extra_config+=("--enable-multilib")
     1.9 +    else
    1.10 +        extra_config+=("--disable-multilib")
    1.11 +    fi
    1.12 +
    1.13      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    1.14  
    1.15      # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
    1.16 @@ -310,7 +316,6 @@
    1.17          --target=${CT_TARGET}                       \
    1.18          --prefix="${core_prefix_dir}"               \
    1.19          --with-local-prefix="${CT_SYSROOT_DIR}"     \
    1.20 -        --disable-multilib                          \
    1.21          --disable-libmudflap                        \
    1.22          ${CC_CORE_SYSROOT_ARG}                      \
    1.23          "${extra_config[@]}"                        \
    1.24 @@ -439,7 +444,6 @@
    1.25      lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;')
    1.26  
    1.27      extra_config+=("--enable-languages=${lang_opt}")
    1.28 -    extra_config+=("--disable-multilib")
    1.29      for tmp in ARCH ABI CPU TUNE FPU FLOAT; do
    1.30          eval tmp="\${CT_ARCH_WITH_${tmp}}"
    1.31          if [ -n "${tmp}" ]; then
    1.32 @@ -611,6 +615,12 @@
    1.33          extra_config+=("--with-system-zlib")
    1.34      fi
    1.35  
    1.36 +    if [ "${CT_MULTILIB}" = "y" ]; then
    1.37 +        extra_config+=("--enable-multilib")
    1.38 +    else
    1.39 +        extra_config+=("--disable-multilib")
    1.40 +    fi
    1.41 +
    1.42      CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
    1.43  
    1.44      CT_DoExecLog CFG                                \