From 6118403fa4315388946babd25be38a9524a5e2c5 Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Sat, 25 Apr 2015 23:14:26 +0100 Subject: Rename macro s/KLEE_INSTALL_LIB_DIR/KLEE_INSTALL_RUNTIME_DIR/ The new name is more accurrate. --- Makefile.common | 4 ++-- tools/klee/main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.common b/Makefile.common index c56d1666..268de9f8 100644 --- a/Makefile.common +++ b/Makefile.common @@ -26,7 +26,7 @@ include $(PROJ_SRC_ROOT)/Makefile.rules # We have to build the bytecode install directory manually. # FIXME: Doing it this way is potentially racey! install:: - mkdir -p $(BYTECODE_DESTINATION) + $(MKDIR) $(BYTECODE_DESTINATION) # LLVMCC was added in 2.7. ifeq ($(LLVMCC),) @@ -53,7 +53,7 @@ KLEE_UCLIBC_BCA_NAME="klee-uclibc.bca" CXX.Flags += $(STP_CFLAGS) CXX.Flags += -DKLEE_DIR=\"$(PROJ_OBJ_ROOT)\" -DKLEE_INSTALL_BIN_DIR=\"$(PROJ_bindir)\" -CXX.Flags += -DKLEE_INSTALL_LIB_DIR=\"$(BYTECODE_DESTINATION)\" +CXX.Flags += -DKLEE_INSTALL_RUNTIME_DIR=\"$(BYTECODE_DESTINATION)\" ifeq ($(ENABLE_UCLIBC),1) CXX.Flags += -DKLEE_UCLIBC_BCA_NAME=\"$(KLEE_UCLIBC_BCA_NAME)\" diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index 97192183..aba247e7 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -594,7 +594,7 @@ std::string KleeHandler::getRunTimeLibraryPath(const char *argv0) { { KLEE_DEBUG_WITH_TYPE("klee_runtime", llvm::dbgs() << "Using installed KLEE library runtime: "); - libDir = KLEE_INSTALL_LIB_DIR ; + libDir = KLEE_INSTALL_RUNTIME_DIR ; } else { -- cgit 1.4.1