1.1 --- a/scripts/build/companion_libs/cloog.sh	Sun Sep 13 12:12:05 2009 +0200
     1.2 +++ b/scripts/build/companion_libs/cloog.sh	Sun Sep 13 12:25:33 2009 +0200
     1.3 @@ -34,22 +34,31 @@
     1.4  }
     1.5  
     1.6  do_cloog() {
     1.7 +    local _t
     1.8 +
     1.9 +    # Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!)
    1.10 +    # while versions 0.15.4 onward do have the version in the dirname.
    1.11 +    case "${CT_CLOOG_VERSION}" in
    1.12 +        0.15.3) _t="";;
    1.13 +        *)      _t="-${CT_CLOOG_VERSION}";;
    1.14 +    esac
    1.15 +
    1.16      mkdir -p "${CT_BUILD_DIR}/build-cloog-ppl"
    1.17      cd "${CT_BUILD_DIR}/build-cloog-ppl"
    1.18  
    1.19      CT_DoStep INFO "Installing CLooG/ppl"
    1.20  
    1.21      CT_DoLog EXTRA "Configuring CLooG/ppl"
    1.22 -    CFLAGS="${CT_CFLAGS_FOR_HOST}"      \
    1.23 -    CT_DoExecLog ALL                    \
    1.24 -    "${CT_SRC_DIR}/cloog-ppl/configure" \
    1.25 -        --build=${CT_BUILD}             \
    1.26 -        --host=${CT_HOST}               \
    1.27 -        --prefix="${CT_PREFIX_DIR}"     \
    1.28 -        --with-gmp="${CT_PREFIX_DIR}"   \
    1.29 -        --with-ppl="${CT_PREFIX_DIR}"   \
    1.30 -        --enable-shared                 \
    1.31 -        --disable-static                \
    1.32 +    CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
    1.33 +    CT_DoExecLog ALL                            \
    1.34 +    "${CT_SRC_DIR}/cloog-ppl${_t}/configure"    \
    1.35 +        --build=${CT_BUILD}                     \
    1.36 +        --host=${CT_HOST}                       \
    1.37 +        --prefix="${CT_PREFIX_DIR}"             \
    1.38 +        --with-gmp="${CT_PREFIX_DIR}"           \
    1.39 +        --with-ppl="${CT_PREFIX_DIR}"           \
    1.40 +        --enable-shared                         \
    1.41 +        --disable-static                        \
    1.42          --with-bits=gmp
    1.43  
    1.44      CT_DoLog EXTRA "Building CLooG/ppl"