1.1 --- a/scripts/build/companion_libs/gmp.sh	Sun May 03 21:10:15 2009 +0000
     1.2 +++ b/scripts/build/companion_libs/gmp.sh	Tue May 05 22:04:20 2009 +0000
     1.3 @@ -22,20 +22,32 @@
     1.4  }
     1.5  
     1.6  do_gmp() {
     1.7 +    local opts
     1.8 +    local cflags
     1.9 +
    1.10      mkdir -p "${CT_BUILD_DIR}/build-gmp"
    1.11      cd "${CT_BUILD_DIR}/build-gmp"
    1.12  
    1.13      CT_DoStep INFO "Installing GMP"
    1.14  
    1.15      CT_DoLog EXTRA "Configuring GMP"
    1.16 -    CFLAGS="${CT_CFLAGS_FOR_HOST}"                  \
    1.17 +
    1.18 +    if [ "${CT_PPL_CLOOG}" = "y" ]; then
    1.19 +        opts="--enable-cxx"
    1.20 +        cflags="-fexceptions"
    1.21 +    fi
    1.22 +
    1.23 +    CFLAGS="${CT_CFLAGS_FOR_HOST} ${cflags}"        \
    1.24      CT_DoExecLog ALL                                \
    1.25      "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \
    1.26          --build=${CT_BUILD}                         \
    1.27          --host=${CT_HOST}                           \
    1.28          --prefix="${CT_PREFIX_DIR}"                 \
    1.29 -        --disable-shared --enable-static            \
    1.30 -        --enable-fft --enable-mpbsd
    1.31 +        --disable-shared                            \
    1.32 +        --enable-static                             \
    1.33 +        --enable-fft                                \
    1.34 +        --enable-mpbsd                              \
    1.35 +        ${opts}
    1.36  
    1.37      CT_DoLog EXTRA "Building GMP"
    1.38      CT_DoExecLog ALL make ${PARALLELMFLAGS}
    1.39 @@ -66,8 +78,10 @@
    1.40          --build=${CT_BUILD}                         \
    1.41          --host=${CT_TARGET}                         \
    1.42          --prefix=/usr                               \
    1.43 -        --disable-shared --enable-static            \
    1.44 -        --enable-fft --enable-mpbsd
    1.45 +        --disable-shared                            \
    1.46 +        --enable-static                             \
    1.47 +        --enable-fft                                \
    1.48 +        --enable-mpbsd                              \
    1.49  
    1.50      CT_DoLog EXTRA "Building GMP"
    1.51      CT_DoExecLog ALL make ${PARALLELMFLAGS}