diff options
| author | Dan Liew <daniel.liew@imperial.ac.uk> | 2014-01-25 09:43:07 +0000 |
|---|---|---|
| committer | Dan Liew <daniel.liew@imperial.ac.uk> | 2014-01-25 09:43:07 +0000 |
| commit | 843698676de2b31d422254ac35546393a0d2d469 (patch) | |
| tree | fe6c9baade4e5a1ed5530517c0fb314a1df81f8e /tools | |
| parent | e49c1e1958e863195b01d99c92194289b4034bbb (diff) | |
| download | klee-843698676de2b31d422254ac35546393a0d2d469.tar.gz | |
Upstream STP's libstp now depends on boost. This commit updates
the configure script to detect this by first trying to link without boost and if that fails then trying to link libstp with boost. This also updates the relevant Makefiles so that the klee and kleaver executables link in STP's boost dependencies if necessary.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/kleaver/Makefile | 6 | ||||
| -rw-r--r-- | tools/klee/Makefile | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tools/kleaver/Makefile b/tools/kleaver/Makefile index b93e361d..39ba8fdb 100644 --- a/tools/kleaver/Makefile +++ b/tools/kleaver/Makefile @@ -30,4 +30,8 @@ ifeq ($(ENABLE_METASMT),1) CXX.Flags += -DBOOST_HAS_GCC_TR1 CXX.Flags := $(filter-out -fno-exceptions,$(CXX.Flags)) LIBS += -lrt -lgomp -lboost_iostreams -lboost_thread -lboost_system -lmetaSMT -lz3 -lboolector -lminisat_core -endif \ No newline at end of file +endif + +ifeq ($(STP_NEEDS_BOOST),1) + LIBS += $(UPSTREAM_STP_LINK_FLAGS) +endif diff --git a/tools/klee/Makefile b/tools/klee/Makefile index f050bf74..ce5a21e6 100644 --- a/tools/klee/Makefile +++ b/tools/klee/Makefile @@ -31,4 +31,8 @@ ifeq ($(ENABLE_METASMT),1) CXX.Flags += -DBOOST_HAS_GCC_TR1 CXX.Flags := $(filter-out -fno-exceptions,$(CXX.Flags)) LIBS += -lrt -lgomp -lboost_iostreams -lboost_thread -lboost_system -lmetaSMT -lz3 -lboolector -lminisat_core -endif \ No newline at end of file +endif + +ifeq ($(STP_NEEDS_BOOST),1) + LIBS += $(UPSTREAM_STP_LINK_FLAGS) +endif |