cc/gcc: build multilib

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
Yann E. MORIN" 2011-11-23 23:51:07 +01:00
parent c23fe1a32a
commit 61ce016e46

View File

@ -297,6 +297,12 @@ do_cc_core() {
extra_config+=("--with-system-zlib") extra_config+=("--with-system-zlib")
fi 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_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) # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532)
@ -310,7 +316,6 @@ do_cc_core() {
--target=${CT_TARGET} \ --target=${CT_TARGET} \
--prefix="${core_prefix_dir}" \ --prefix="${core_prefix_dir}" \
--with-local-prefix="${CT_SYSROOT_DIR}" \ --with-local-prefix="${CT_SYSROOT_DIR}" \
--disable-multilib \
--disable-libmudflap \ --disable-libmudflap \
${CC_CORE_SYSROOT_ARG} \ ${CC_CORE_SYSROOT_ARG} \
"${extra_config[@]}" \ "${extra_config[@]}" \
@ -439,7 +444,6 @@ do_cc() {
lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;') lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;')
extra_config+=("--enable-languages=${lang_opt}") extra_config+=("--enable-languages=${lang_opt}")
extra_config+=("--disable-multilib")
for tmp in ARCH ABI CPU TUNE FPU FLOAT; do for tmp in ARCH ABI CPU TUNE FPU FLOAT; do
eval tmp="\${CT_ARCH_WITH_${tmp}}" eval tmp="\${CT_ARCH_WITH_${tmp}}"
if [ -n "${tmp}" ]; then if [ -n "${tmp}" ]; then
@ -611,6 +615,12 @@ do_cc() {
extra_config+=("--with-system-zlib") extra_config+=("--with-system-zlib")
fi 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_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
CT_DoExecLog CFG \ CT_DoExecLog CFG \