1.1 --- a/scripts/build/companion_libs/cloog.sh	Sun Mar 20 01:07:06 2011 +0100
     1.2 +++ b/scripts/build/companion_libs/cloog.sh	Thu Aug 18 16:05:48 2011 +0200
     1.3 @@ -37,8 +37,6 @@
     1.4  
     1.5  do_cloog() {
     1.6      local _t
     1.7 -    local cloog_LDFLAGS
     1.8 -    local -a cloog_opts
     1.9  
    1.10      # Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!)
    1.11      # while versions 0.15.4 onward do have the version in the dirname.
    1.12 @@ -54,17 +52,9 @@
    1.13  
    1.14      CT_DoLog EXTRA "Configuring CLooG/ppl"
    1.15  
    1.16 -    if [ "${CT_COMPLIBS_SHARED}" = "y" ]; then
    1.17 -        cloog_opts+=( --enable-shared --disable-static )
    1.18 -    else
    1.19 -        cloog_opts+=( --disable-shared --enable-static )
    1.20 -        cloog_opts+=( --with-host-libstdcxx='-lstdc++' )
    1.21 -        cloog_LDFLAGS='-lm'
    1.22 -    fi
    1.23 -
    1.24      CT_DoExecLog CFG                            \
    1.25      CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
    1.26 -    LDFLAGS="${cloog_LDFLAGS}"                  \
    1.27 +    LDFLAGS="-lm"                               \
    1.28      "${CT_SRC_DIR}/cloog-ppl${_t}/configure"    \
    1.29          --build=${CT_BUILD}                     \
    1.30          --host=${CT_HOST}                       \
    1.31 @@ -72,7 +62,9 @@
    1.32          --with-gmp="${CT_COMPLIBS_DIR}"         \
    1.33          --with-ppl="${CT_COMPLIBS_DIR}"         \
    1.34          --with-bits=gmp                         \
    1.35 -        "${cloog_opts[@]}"
    1.36 +        --with-host-libstdcxx='-lstdc++'        \
    1.37 +        --disable-shared                        \
    1.38 +        --enable-static
    1.39  
    1.40      CT_DoLog EXTRA "Building CLooG/ppl"
    1.41      CT_DoExecLog ALL make ${JOBSFLAGS} libcloog.la