From 843698676de2b31d422254ac35546393a0d2d469 Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Sat, 25 Jan 2014 09:43:07 +0000 Subject: 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. --- tools/kleaver/Makefile | 6 +++++- tools/klee/Makefile | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'tools') 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 -- cgit 1.4.1