From d34a5ec7d8003256b859421dc080be0362663678 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 12 Sep 2010 20:54:54 +0200 Subject: cc/gcc: do not force use of non-vital companion libraries While GMP and MPFR are required by gcc>=4.3 (to build the frontends), and MPC is required by gcc>=4.5, the other libs are not. If they are present then gcc will enable advanced features; if they are missing, then gcc will (should) simply disable those features. Signed-off-by: "Yann E. MORIN" --- scripts/build/cc/gcc.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'scripts/build/cc') diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index e4d75e7e..0f12c61f 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -169,12 +169,14 @@ do_cc_core() { extra_config+=("--with-gmp=${CT_COMPLIBS_DIR}") extra_config+=("--with-mpfr=${CT_COMPLIBS_DIR}") fi - if [ "${CT_CC_GCC_USE_PPL_CLOOG}" = "y" ]; then + if [ "${CT_CC_GCC_USE_MPC}" = "y" ]; then + extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}") + fi + if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then extra_config+=("--with-ppl=${CT_COMPLIBS_DIR}") extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}") fi - if [ "${CT_CC_GCC_USE_MPC_LIBELF}" = "y" ]; then - extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}") + if [ "${CT_CC_GCC_USE_LTO}" = "y" ]; then extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}") fi @@ -365,12 +367,14 @@ do_cc() { extra_config+=("--with-gmp=${CT_COMPLIBS_DIR}") extra_config+=("--with-mpfr=${CT_COMPLIBS_DIR}") fi - if [ "${CT_CC_GCC_USE_PPL_CLOOG}" = "y" ]; then + if [ "${CT_CC_GCC_USE_MPC}" = "y" ]; then + extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}") + fi + if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then extra_config+=("--with-ppl=${CT_COMPLIBS_DIR}") extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}") fi - if [ "${CT_CC_GCC_USE_MPC_LIBELF}" = "y" ]; then - extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}") + if [ "${CT_CC_GCC_USE_LTO}" = "y" ]; then extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}") fi -- cgit v1.2.3