diff -r 3dc2727ebffc -r 240df3865193 scripts/build/cc/gcc.sh --- a/scripts/build/cc/gcc.sh Sat Dec 31 16:23:27 2011 +0100 +++ b/scripts/build/cc/gcc.sh Wed Nov 23 23:51:07 2011 +0100 @@ -297,6 +297,12 @@ extra_config+=("--with-system-zlib") fi + if [ "${CT_MULTILIB}" = "y" ]; then + extra_config+=("--enable-multilib") + else + extra_config+=("--disable-multilib") + fi + CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532) @@ -310,7 +316,6 @@ --target=${CT_TARGET} \ --prefix="${core_prefix_dir}" \ --with-local-prefix="${CT_SYSROOT_DIR}" \ - --disable-multilib \ --disable-libmudflap \ ${CC_CORE_SYSROOT_ARG} \ "${extra_config[@]}" \ @@ -439,7 +444,6 @@ lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;') extra_config+=("--enable-languages=${lang_opt}") - extra_config+=("--disable-multilib") for tmp in ARCH ABI CPU TUNE FPU FLOAT; do eval tmp="\${CT_ARCH_WITH_${tmp}}" if [ -n "${tmp}" ]; then @@ -611,6 +615,12 @@ extra_config+=("--with-system-zlib") fi + if [ "${CT_MULTILIB}" = "y" ]; then + extra_config+=("--enable-multilib") + else + extra_config+=("--disable-multilib") + fi + CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" CT_DoExecLog CFG \