diff options
| author | Dan Liew <daniel.liew@imperial.ac.uk> | 2013-12-15 19:08:46 +0000 |
|---|---|---|
| committer | Dan Liew <daniel.liew@imperial.ac.uk> | 2013-12-21 23:22:46 +0000 |
| commit | 492de06e578a76a8d6b8311dd7c1c1c440623072 (patch) | |
| tree | 1c3eccd76351844c4a5dff986e7ecf8732062d6d | |
| parent | 857831d18708ada4590c511494d3ae5f94cf6a6a (diff) | |
| download | klee-492de06e578a76a8d6b8311dd7c1c1c440623072.tar.gz | |
Revert "Patch from Ben Gras which "makes Klee look for the libraries in the"
This reverts commit 1715ee37118cdf8785a1dd70d812b6a88ad623e7. Conflicts: Makefile.common Future commits are going to add a more way elegant to handle the search for libraries in build/install directory.
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rw-r--r-- | tools/klee/main.cpp | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/Makefile.common b/Makefile.common index 3f60bbec..3550baae 100644 --- a/Makefile.common +++ b/Makefile.common @@ -32,7 +32,7 @@ C.Flags += -std=gnu89 LD.Flags += -L$(STP_ROOT)/lib CXX.Flags += -I$(STP_ROOT)/include -CXX.Flags += -DKLEE_DIR=\"$(PROJ_OBJ_ROOT)\" -DKLEE_LIB_DIR=\"$(PROJ_libdir)\" +CXX.Flags += -DKLEE_DIR=\"$(PROJ_OBJ_ROOT)\" # For STP. CXX.Flags += -DEXT_HASH_MAP diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index 3616bfa6..9d5a1b1d 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -1227,14 +1227,7 @@ int main(int argc, char **argv, char **envp) { return r; } -#if defined(KLEE_LIB_DIR) && defined(USE_KLEE_LIB_DIR) - /* KLEE_LIB_DIR is the lib dir of installed files as opposed to - * where libs in the klee source tree are generated. - */ - llvm::sys::Path LibraryDir(KLEE_LIB_DIR); -#else llvm::sys::Path LibraryDir(KLEE_DIR "/" RUNTIME_CONFIGURATION "/lib"); -#endif Interpreter::ModuleOptions Opts(LibraryDir.c_str(), /*Optimize=*/OptimizeModule, /*CheckDivZero=*/CheckDivZero, |