diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-10 17:52:26 -0400 |
---|---|---|
committer | Morgan Deters <mdeters@cs.nyu.edu> | 2014-06-11 16:18:23 -0400 |
commit | 6f1454d2082d4e8783c3b35c30144ff557b99444 (patch) | |
tree | 3339ec7eb47f5aa272fbe1511e1036e9790d0507 /contrib/get-abc | |
parent | 3c2458b633501345fba2679c611ce9e5c7a9f538 (diff) |
Some clean-up, post bv-merge.
Add abc to build id and fix static building.
Add abc to --show-config output and Configuration class API.
Add ability to select abc source path.
Fix arch_flags for abc.
Diffstat (limited to 'contrib/get-abc')
-rwxr-xr-x | contrib/get-abc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/get-abc b/contrib/get-abc index 97fbb1503..f5a397039 100755 --- a/contrib/get-abc +++ b/contrib/get-abc @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash # set -e @@ -42,11 +42,13 @@ 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 -make libabc.a OPTFLAGS=-O +# 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 mv libabc.a libabc-static.a make clean -make libabc.a OPTFLAGS='-O -fPIC' +make libabc.a OPTFLAGS='-O -fPIC' READLINE=0 PTHREADS=0 echo echo ===================== Now configure CVC4 with ===================== -echo ./configure --with-abc=`pwd` +echo ./configure --with-abc --with-abc-dir=`pwd` |