From a008fb78987a4675d12f5934f3d51bbd84c3f653 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Mon, 5 Apr 2010 04:02:31 +0000 Subject: STP: Switch build to using LLVM style Makefiles. git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@100395 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/kleaver/Makefile | 7 ++++--- tools/klee/Makefile | 12 ++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'tools') diff --git a/tools/kleaver/Makefile b/tools/kleaver/Makefile index 0bb184bb..d9c417c1 100644 --- a/tools/kleaver/Makefile +++ b/tools/kleaver/Makefile @@ -9,11 +9,12 @@ LEVEL=../.. TOOLNAME = kleaver +STP_LIBS := stp_c_interface.a stp_AST.a stp_bitvec.a stp_constantbv.a stp_sat.a \ + stp_simplifier.a # FIXME: Ideally we wouldn't have any LLVM dependencies here, which # means kicking out klee's Support. -USEDLIBS = kleaverSolver.a kleaverExpr.a kleeSupport.a kleeBasic.a +USEDLIBS = kleaverSolver.a kleaverExpr.a kleeSupport.a kleeBasic.a \ + $(STP_LIBS) LINK_COMPONENTS = support include $(LEVEL)/Makefile.common - -LIBS += -lstp diff --git a/tools/klee/Makefile b/tools/klee/Makefile index fbdcfd85..72188b79 100644 --- a/tools/klee/Makefile +++ b/tools/klee/Makefile @@ -9,14 +9,10 @@ LEVEL=../.. TOOLNAME = klee -USEDLIBS = kleeCore.a kleeModule.a kleaverSolver.a kleaverExpr.a kleeSupport.a kleeBasic.a +STP_LIBS := stp_c_interface.a stp_AST.a stp_bitvec.a stp_constantbv.a stp_sat.a \ + stp_simplifier.a +USEDLIBS = kleeCore.a kleeModule.a kleaverSolver.a kleaverExpr.a kleeSupport.a kleeBasic.a \ + $(STP_LIBS) LINK_COMPONENTS = jit bitreader bitwriter ipo linker engine include $(LEVEL)/Makefile.common - -ifeq ($(ENABLE_STPLOG), 1) - LIBS += -lstplog -endif - -LIBS += -lstp -#-ltcmalloc -- cgit 1.4.1