cc/gcc: fix use of companion libraries

This commit is contained in:
Yann E. MORIN" 2010-03-05 18:55:25 +01:00
parent 99078431ad
commit 8e47201cf2
2 changed files with 30 additions and 12 deletions

View File

@ -102,13 +102,23 @@ endchoice
config CC_GCC_4_3_or_later
bool
default n
select GMP
select MPFR
select CC_GCC_USE_GMP_MPFR
config CC_GCC_4_4_or_later
bool
default n
select CC_GCC_4_3_or_later
select CC_GCC_USE_PPL_CLOOG_MPC
config CC_GCC_USE_GMP_MPFR
bool
default n
select GMP
select MPFR
config CC_GCC_USE_PPL_CLOOG_MPC
bool
default n
select PPL
select CLOOG
select MPC

View File

@ -150,11 +150,15 @@ do_cc_core() {
else
extra_config+=("--disable-__cxa_atexit")
fi
[ -z "${CT_GMP}" ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
[ -z "${CT_MPFR}" ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
[ -z "${CT_PPL}" ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
[ -z "${CT_CLOOG}" ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
[ -z "${CT_MPC}" ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
if [ "${CT_GCC_USE_GMP_MPFR}" = "y" ]; then
extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
fi
if [ "${CT_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
fi
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
@ -299,11 +303,15 @@ do_cc() {
if [ -n "${CC_ENABLE_CXX_FLAGS}" ]; then
extra_config+=("--enable-cxx-flags=${CC_ENABLE_CXX_FLAGS}")
fi
[ -z "${CT_GMP}" ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
[ -z "${CT_MPFR}" ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
[ -z "${CT_PPL}" ] || extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
[ -z "${CT_CLOOG}" ] || extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
[ -z "${CT_MPC}" ] || extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
if [ "${CT_GCC_USE_GMP_MPFR}" = "y" ]; then
extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
fi
if [ "${CT_GCC_USE_PPL_CLOOG_MPC}" = "y" ]; then
extra_config+=("--with-ppl=${CT_PREFIX_DIR}")
extra_config+=("--with-cloog=${CT_PREFIX_DIR}")
extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
fi
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"