diff options
| author | Cristian Cadar <cristic@cs.stanford.edu> | 2012-07-31 17:21:30 +0000 |
|---|---|---|
| committer | Cristian Cadar <cristic@cs.stanford.edu> | 2012-07-31 17:21:30 +0000 |
| commit | c582aa704b9f0d2729e76251aeb4676d4cb866a6 (patch) | |
| tree | a8303928c18d72cad31f08cb07407ec080e9949d /tools | |
| parent | 1fdb4ef41ea8a87225f751fa87534c5ac1751d40 (diff) | |
| download | klee-c582aa704b9f0d2729e76251aeb4676d4cb866a6.tar.gz | |
Patch by Dan Liew that removes our internal copy of STP, and makes the --with-stp option mandatory:
"1. At configure time the --with-stp= option is now mandatory. 2. The HAVE_EXT_STP macro has been removed. 3. The ENABLE_EXT_STP autoconf replacement variable has been removed and consequently the Makefile variable of the same name has been removed." git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@161055 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/kleaver/Makefile | 9 | ||||
| -rw-r--r-- | tools/klee/Makefile | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/tools/kleaver/Makefile b/tools/kleaver/Makefile index 21d84cbe..3973a2e6 100644 --- a/tools/kleaver/Makefile +++ b/tools/kleaver/Makefile @@ -12,18 +12,11 @@ TOOLNAME = kleaver include $(LEVEL)/Makefile.config -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 -ifeq ($(ENABLE_EXT_STP),0) - USEDLIBS += $(STP_LIBS) -endif LINK_COMPONENTS = support include $(LEVEL)/Makefile.common -ifeq ($(ENABLE_EXT_STP),1) - LIBS += -lstp -endif +LIBS += -lstp diff --git a/tools/klee/Makefile b/tools/klee/Makefile index 23c8f1d9..6e05a5a9 100644 --- a/tools/klee/Makefile +++ b/tools/klee/Makefile @@ -12,16 +12,9 @@ TOOLNAME = klee include $(LEVEL)/Makefile.config -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 -ifeq ($(ENABLE_EXT_STP),0) - USEDLIBS += $(STP_LIBS) -endif LINK_COMPONENTS = jit bitreader bitwriter ipo linker engine include $(LEVEL)/Makefile.common -ifeq ($(ENABLE_EXT_STP),1) - LIBS += -lstp -endif +LIBS += -lstp |