diff options
| author | Clark Barrett <barrett@cs.stanford.edu> | 2017-05-27 19:47:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-27 19:47:34 -0700 |
| commit | 84df84769e6762562c599432ea681f9fa0c7e0ff (patch) | |
| tree | 4bf9babf82ac89cecbdc0bca8f04732c3a7e91cb | |
| parent | 5b2d5430d08ae663d086d8d8e3944e01062935ec (diff) | |
| parent | 5a9f61fa2de4e3085844d620c9adb42be97bb254 (diff) | |
Merge pull request #164 from CVC4/fix_comp
[Competition] Fix ABC, fix CryptoMiniSat req
| -rw-r--r-- | config/cryptominisat.m4 | 10 | ||||
| -rwxr-xr-x | contrib/get-abc | 9 |
2 files changed, 7 insertions, 12 deletions
diff --git a/config/cryptominisat.m4 b/config/cryptominisat.m4 index f7d3a1544..e35420edb 100644 --- a/config/cryptominisat.m4 +++ b/config/cryptominisat.m4 @@ -37,8 +37,8 @@ elif test -n "$with_cryptominisat"; then dnl TODO FIXME: dnl For some reason the CVC4_TRY_CRYPTOMINISAT is not working correctly - CVC4_TRY_CRYPTOMINISAT_WITH([]) - CVC4_TRY_CRYPTOMINISAT_WITH([-lm4ri]) + CVC4_TRY_CRYPTOMINISAT_WITH([-pthread]) + CVC4_TRY_CRYPTOMINISAT_WITH([-pthread -lm4ri]) if test -z "$CRYPTOMINISAT_LIBS"; then AC_MSG_FAILURE([cannot link against libcryptominisat!]) @@ -48,7 +48,6 @@ elif test -n "$with_cryptominisat"; then fi CRYPTOMINISAT_LDFLAGS="-L$CRYPTOMINISAT_HOME/install/lib" - CRYPTOMINISAT_LIBS="-lcryptominisat4 -lm4ri" else AC_MSG_RESULT([no, user didn't request cryptominisat]) @@ -71,10 +70,9 @@ if test -z "$CRYPTOMINISAT_LIBS"; then LDFLAGS="-L$CRYPTOMINISAT_HOME/install/lib" LIBS="-lcryptominisat4 $1" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([#include <cryptominisat4/cryptominisat.h>], - [CMSat::SATSolver test()])], [CRYPTOMINISAT_LIBS="-lcryptominisat4 $1"], + [AC_LANG_PROGRAM([[#include <cryptominisat4/cryptominisat.h>]], + [[CMSat::SATSolver test()]])], [CRYPTOMINISAT_LIBS="-lcryptominisat4 $1"], [CRYPTOMINISAT_LIBS=]) LDFLAGS="$cvc4_save_LDFLAGS" diff --git a/contrib/get-abc b/contrib/get-abc index c60e403e6..7cf833e23 100755 --- a/contrib/get-abc +++ b/contrib/get-abc @@ -2,7 +2,7 @@ # set -e -commit=3c5d3319120b +commit=53f39c11b58d cd "$(dirname "$0")/.." @@ -39,9 +39,6 @@ gunzip -f abc-$commit.tar.gz tar xfv abc-$commit.tar cd alanmi-abc-$commit -cp src/base/main/main.c src/base/main/main.c.orig -sed 's,^// *#define ABC_LIB *$,#define ABC_LIB,' src/base/main/main.c.orig > src/base/main/main.c - # Strip out libSupport.c, it is in charge of loading extensions and we # don't want different behavior based on ABC_LIB_PATH, or based on what # .so is in the current directory! @@ -52,10 +49,10 @@ sed 's,\( *\)\(.*Libs_Init(\),\1//\2,;s,\( *\)\(.*Libs_End(\),\1//\2,' src/base/ # Build optimized, without readline, without pthreads. # These aren't necessary for our usage and we don't want the dependencies. -make libabc.a OPTFLAGS=-O READLINE=0 PTHREADS=0 +make libabc.a OPTFLAGS=-O ABC_USE_NO_READLINE=1 ABC_USE_NO_PTHREADS=1 mv libabc.a libabc-static.a make clean -make libabc.a OPTFLAGS='-O -fPIC' READLINE=0 PTHREADS=0 +make libabc.a OPTFLAGS='-O -fPIC' ABC_USE_NO_READLINE=1 ABC_USE_NO_PTHREADS=1 echo echo ===================== Now configure CVC4 with ===================== |