diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/kleaver/Makefile | 4 | ||||
| -rw-r--r-- | tools/kleaver/main.cpp | 14 | ||||
| -rw-r--r-- | tools/klee-stats/Makefile | 4 | ||||
| -rw-r--r-- | tools/klee/Makefile | 4 | ||||
| -rw-r--r-- | tools/klee/main.cpp | 5 | ||||
| -rw-r--r-- | tools/ktest-tool/Makefile | 4 |
6 files changed, 15 insertions, 20 deletions
diff --git a/tools/kleaver/Makefile b/tools/kleaver/Makefile index 656ffeae..f66d0598 100644 --- a/tools/kleaver/Makefile +++ b/tools/kleaver/Makefile @@ -31,7 +31,3 @@ ifeq ($(ENABLE_METASMT),1) CXX.Flags := $(filter-out -fno-exceptions,$(CXX.Flags)) LIBS += -lgomp -lboost_iostreams -lboost_thread -lboost_system -lmetaSMT -lz3 -lrt -lboolector -lminisat_core endif - -ifeq ($(STP_NEEDS_BOOST),1) - LIBS += $(UPSTREAM_STP_LINK_FLAGS) -endif diff --git a/tools/kleaver/main.cpp b/tools/kleaver/main.cpp index 07baee24..fafe955f 100644 --- a/tools/kleaver/main.cpp +++ b/tools/kleaver/main.cpp @@ -13,7 +13,7 @@ #include "klee/util/ExprPPrinter.h" #include "klee/util/ExprVisitor.h" -#include "klee/util/ExprSMTLIBLetPrinter.h" +#include "klee/util/ExprSMTLIBPrinter.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/CommandLine.h" @@ -400,8 +400,8 @@ static bool printInputAsSMTLIBv2(const char *Filename, if (!success) return false; - ExprSMTLIBPrinter* printer = createSMTLIBPrinter(); - printer->setOutput(llvm::outs()); + ExprSMTLIBPrinter printer; + printer.setOutput(llvm::outs()); unsigned int queryNumber = 0; //Loop over the declarations @@ -426,12 +426,12 @@ static bool printInputAsSMTLIBv2(const char *Filename, */ ConstraintManager constraintM(QC->Constraints); Query query(constraintM,QC->Query); - printer->setQuery(query); + printer.setQuery(query); if(!QC->Objects.empty()) - printer->setArrayValuesToGet(QC->Objects); + printer.setArrayValuesToGet(QC->Objects); - printer->generateOutput(); + printer.generateOutput(); queryNumber++; @@ -444,8 +444,6 @@ static bool printInputAsSMTLIBv2(const char *Filename, delete *it; delete P; - delete printer; - return true; } diff --git a/tools/klee-stats/Makefile b/tools/klee-stats/Makefile index 89578b12..219d41da 100644 --- a/tools/klee-stats/Makefile +++ b/tools/klee-stats/Makefile @@ -36,11 +36,11 @@ install-local:: uninstall-local:: $(Echo) Uninstall circumvented with NO_INSTALL else -DestTool = $(PROJ_bindir)/$(TOOLSCRIPTNAME) +DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLSCRIPTNAME) install-local:: $(DestTool) -$(DestTool): $(ToolBuildPath) $(PROJ_bindir) +$(DestTool): $(ToolBuildPath) $(DESTDIR)$(PROJ_bindir) $(Echo) Installing $(BuildMode) $(DestTool) $(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool) diff --git a/tools/klee/Makefile b/tools/klee/Makefile index 03b387c0..b9506b47 100644 --- a/tools/klee/Makefile +++ b/tools/klee/Makefile @@ -32,7 +32,3 @@ ifeq ($(ENABLE_METASMT),1) CXX.Flags := $(filter-out -fno-exceptions,$(CXX.Flags)) LIBS += -lgomp -lboost_iostreams -lboost_thread -lboost_system -lmetaSMT -lz3 -lrt -lboolector -lminisat_core endif - -ifeq ($(STP_NEEDS_BOOST),1) - LIBS += $(UPSTREAM_STP_LINK_FLAGS) -endif diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index a92aa559..23c07f03 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -575,6 +575,11 @@ void KleeHandler::getOutFiles(std::string path, } std::string KleeHandler::getRunTimeLibraryPath(const char *argv0) { + // allow specifying the path to the runtime library + const char *env = getenv("KLEE_RUNTIME_LIBRARY_PATH"); + if (env) + return std::string(env); + // Take any function from the execution binary but not main (as not allowed by // C++ standard) void *MainExecAddr = (void *)(intptr_t)getRunTimeLibraryPath; diff --git a/tools/ktest-tool/Makefile b/tools/ktest-tool/Makefile index 580b1f6a..dcf74736 100644 --- a/tools/ktest-tool/Makefile +++ b/tools/ktest-tool/Makefile @@ -36,11 +36,11 @@ install-local:: uninstall-local:: $(Echo) Uninstall circumvented with NO_INSTALL else -DestTool = $(PROJ_bindir)/$(TOOLSCRIPTNAME) +DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLSCRIPTNAME) install-local:: $(DestTool) -$(DestTool): $(ToolBuildPath) $(PROJ_bindir) +$(DestTool): $(ToolBuildPath) $(DESTDIR)$(PROJ_bindir) $(Echo) Installing $(BuildMode) $(DestTool) $(Verb) $(ProgInstall) $(ToolBuildPath) $(DestTool) |