From: Mathias Preiner Date: Tue, 30 Jun 2020 19:12:25 +0000 (-0700) Subject: Fix GMP compilation for win64. (#4675) X-Git-Tag: cvc5-1.0.0~3161 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=770350a0e14d0e13d5f5b9050c60eb3a449575f3;p=cvc5.git Fix GMP compilation for win64. (#4675) --- diff --git a/contrib/get-gmp-dev b/contrib/get-gmp-dev index c844db93c..ef2023d04 100755 --- a/contrib/get-gmp-dev +++ b/contrib/get-gmp-dev @@ -11,7 +11,7 @@ source "$(dirname "$0")/get-script-header.sh" -[ -z "${BUILD_TYPE}" ] && BUILD_TYPE="--disable-shared --enable-static" +[ -z "${BUILD_TYPE}" ] && BUILD_TYPE="--enable-shared --enable-static" [ -n "$HOST" ] && HOST="--host=$HOST" [ -z "$GMPVERSION" ] && GMPVERSION=6.2.0 @@ -36,7 +36,7 @@ echo "Setting up GMP $GMPVERSION..." echo setup_dep "https://gmplib.org/download/gmp/gmp-$GMPVERSION.tar.bz2" "$GMP_DIR" cd "$GMP_DIR" -./configure ${HOST} --prefix="$INSTALL_DIR" --enable-cxx ${BUILD_TYPE} --enable-shared --enable-static +./configure ${HOST} --prefix="$INSTALL_DIR" --enable-cxx ${BUILD_TYPE} make \ CFLAGS="${MAKE_CFLAGS}" \ CXXFLAGS="${MAKE_CXXFLAGS}" \ diff --git a/contrib/get-win-dependencies b/contrib/get-win-dependencies index 02b1e4054..47acc7c08 100755 --- a/contrib/get-win-dependencies +++ b/contrib/get-win-dependencies @@ -38,7 +38,7 @@ if [ -z "$HOST" ]; then echo "WARNING:" fi -GMPVERSION=6.1.2 +GMPVERSION=6.2.0 BOOSTVERSION=1.55.0 BOOSTBASE=boost_1_55_0