1.1 --- a/scripts/build/cc/gcc.sh	Mon May 13 15:00:56 2013 +0800
     1.2 +++ b/scripts/build/cc/gcc.sh	Sun May 05 17:59:00 2013 +0200
     1.3 @@ -282,15 +282,21 @@
     1.4          extra_config+=("--with-mpc=${complibs}")
     1.5      fi
     1.6      if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then
     1.7 -        extra_config+=("--with-ppl=${complibs}")
     1.8 -        # With PPL 0.11+, also pull libpwl if needed
     1.9 -        if [ "${CT_PPL_NEEDS_LIBPWL}" = "y" ]; then
    1.10 -            host_libstdcxx_flags+=("-L${complibs}/lib")
    1.11 -            host_libstdcxx_flags+=("-lpwl")
    1.12 +        if [ "${CT_PPL}" = "y" ]; then
    1.13 +            extra_config+=("--with-ppl=${complibs}")
    1.14 +            # With PPL 0.11+, also pull libpwl if needed
    1.15 +            if [ "${CT_PPL_NEEDS_LIBPWL}" = "y" ]; then
    1.16 +                host_libstdcxx_flags+=("-L${complibs}/lib")
    1.17 +                host_libstdcxx_flags+=("-lpwl")
    1.18 +            fi
    1.19 +        fi
    1.20 +        if [ "${CT_ISL}" = "y" ]; then
    1.21 +            extra_config+=("--with-isl=${complibs}")
    1.22          fi
    1.23          extra_config+=("--with-cloog=${complibs}")
    1.24      elif [ "${CT_CC_GCC_HAS_GRAPHITE}" = "y" ]; then
    1.25          extra_config+=("--with-ppl=no")
    1.26 +        extra_config+=("--with-isl=no")
    1.27          extra_config+=("--with-cloog=no")
    1.28      fi
    1.29      if [ "${CT_CC_GCC_USE_LTO}" = "y" ]; then
    1.30 @@ -694,15 +700,21 @@
    1.31          extra_config+=("--with-mpc=${complibs}")
    1.32      fi
    1.33      if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then
    1.34 -        extra_config+=("--with-ppl=${complibs}")
    1.35 -        # With PPL 0.11+, also pull libpwl if needed
    1.36 -        if [ "${CT_PPL_NEEDS_LIBPWL}" = "y" ]; then
    1.37 -            host_libstdcxx_flags+=("-L${complibs}/lib")
    1.38 -            host_libstdcxx_flags+=("-lpwl")
    1.39 +        if [ "${CT_PPL}" = "y" ]; then
    1.40 +            extra_config+=("--with-ppl=${complibs}")
    1.41 +            # With PPL 0.11+, also pull libpwl if needed
    1.42 +            if [ "${CT_PPL_NEEDS_LIBPWL}" = "y" ]; then
    1.43 +                host_libstdcxx_flags+=("-L${complibs}/lib")
    1.44 +                host_libstdcxx_flags+=("-lpwl")
    1.45 +            fi
    1.46 +        fi
    1.47 +        if [ "${CT_ISL}" = "y" ]; then
    1.48 +            extra_config+=("--with-isl=${complibs}")
    1.49          fi
    1.50          extra_config+=("--with-cloog=${complibs}")
    1.51      elif [ "${CT_CC_GCC_HAS_GRAPHITE}" = "y" ]; then
    1.52          extra_config+=("--with-ppl=no")
    1.53 +        extra_config+=("--with-isl=no")
    1.54          extra_config+=("--with-cloog=no")
    1.55      fi
    1.56      if [ "${CT_CC_GCC_USE_LTO}" = "y" ]; then