diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-03-05 17:55:25 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-03-05 17:55:25 (GMT) |
| commit | 8e47201cf2c9c6a47385e2b7e65aed6715044cb4 (patch) | |
| tree | 7bcaf0095ac15c068c5de5edf14574711f8be465 | |
| parent | 99078431ad3efdbd8dc1fc5eace91a3cde2cc966 (diff) | |
cc/gcc: fix use of companion libraries
| -rw-r--r-- | config/cc/gcc.in | 14 | ||||
| -rw-r--r-- | scripts/build/cc/gcc.sh | 28 |
2 files changed, 30 insertions, 12 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 3f336df..053f221 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -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 diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index fbfb5d4..9f0c33b 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -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[*]}'" |