From 9c445a83bc03ca4a0335e98704feee44183831a6 Mon Sep 17 00:00:00 2001 From: Julian Büning Date: Fri, 4 Sep 2020 22:04:57 +0200 Subject: Exception handling only for LLVM >= 8.0.0 --- runtime/CMakeLists.txt | 6 +++--- runtime/Makefile.cmake.bitcode | 2 +- runtime/Makefile.cmake.bitcode.config.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'runtime') diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 8e7e7226..88a3faf8 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -32,7 +32,7 @@ else() set(BUILD_POSIX_RUNTIME 0) endif() -if (ENABLE_KLEE_LIBCXX) +if (ENABLE_KLEE_EH_CXX) set(BUILD_KLEE_EH_CXX 1) else() set(BUILD_KLEE_EH_CXX 0) @@ -54,7 +54,7 @@ set(BITCODE_LIBRARIES "Intrinsic" "klee-libc" "FreeStanding") if (ENABLE_POSIX_RUNTIME) list(APPEND BITCODE_LIBRARIES "POSIX") endif() -if (ENABLE_KLEE_LIBCXX) +if (ENABLE_KLEE_EH_CXX) list(APPEND BITCODE_LIBRARIES "klee-eh-cxx") endif() foreach (bl ${BITCODE_LIBRARIES}) @@ -145,7 +145,7 @@ if (ENABLE_POSIX_RUNTIME) "${KLEE_RUNTIME_DIRECTORY}/libkleeRuntimePOSIX.bca") endif() -if (ENABLE_KLEE_LIBCXX) +if (ENABLE_KLEE_EH_CXX) list(APPEND RUNTIME_FILES_TO_INSTALL "${KLEE_RUNTIME_DIRECTORY}/libklee-eh-cxx.bca") endif() diff --git a/runtime/Makefile.cmake.bitcode b/runtime/Makefile.cmake.bitcode index 1dfdfde6..dd32161d 100644 --- a/runtime/Makefile.cmake.bitcode +++ b/runtime/Makefile.cmake.bitcode @@ -17,7 +17,7 @@ ifneq ($(ENABLE_POSIX_RUNTIME),0) DIRS += POSIX endif -ifneq ($(BUILD_KLEE_EH_CXX),0) +ifneq ($(ENABLE_KLEE_EH_CXX),0) DIRS += klee-eh-cxx endif diff --git a/runtime/Makefile.cmake.bitcode.config.in b/runtime/Makefile.cmake.bitcode.config.in index 99faa647..b3464a14 100644 --- a/runtime/Makefile.cmake.bitcode.config.in +++ b/runtime/Makefile.cmake.bitcode.config.in @@ -32,7 +32,7 @@ RUNTIME_CONFIG_STRING := @KLEE_RUNTIME_BUILD_TYPE@ # Optional features ENABLE_POSIX_RUNTIME := @BUILD_POSIX_RUNTIME@ -BUILD_KLEE_EH_CXX := @BUILD_KLEE_EH_CXX@ +ENABLE_KLEE_EH_CXX := @BUILD_KLEE_EH_CXX@ KLEE_LIBCXX_INCLUDE_DIR := @KLEE_LIBCXX_INCLUDE_DIR@ KLEE_LIBCXXABI_SRC_DIR := @KLEE_LIBCXXABI_SRC_DIR@ KLEE_INCLUDE_DIR := @CMAKE_SOURCE_DIR@/include -- cgit 1.4.1