From 20d08cbef08993340d15855941fa7fe2c86d9f59 Mon Sep 17 00:00:00 2001 From: Julian Büning Date: Sun, 31 May 2020 15:45:20 +0200 Subject: fix building klee-cxxabi Co-authored-by: Felix Rath --- runtime/Makefile.cmake.bitcode.config.in | 4 ++-- runtime/klee-eh-cxx/Makefile.cmake.bitcode | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'runtime') diff --git a/runtime/Makefile.cmake.bitcode.config.in b/runtime/Makefile.cmake.bitcode.config.in index 4e2354b8..99faa647 100644 --- a/runtime/Makefile.cmake.bitcode.config.in +++ b/runtime/Makefile.cmake.bitcode.config.in @@ -32,9 +32,9 @@ RUNTIME_CONFIG_STRING := @KLEE_RUNTIME_BUILD_TYPE@ # Optional features ENABLE_POSIX_RUNTIME := @BUILD_POSIX_RUNTIME@ -BUILD_KLEE_CXXABI := @BUILD_KLEE_CXXABI@ +BUILD_KLEE_EH_CXX := @BUILD_KLEE_EH_CXX@ KLEE_LIBCXX_INCLUDE_DIR := @KLEE_LIBCXX_INCLUDE_DIR@ -KLEE_LIBCXXABI_DIR := @KLEE_LIBCXXABI_DIR@ +KLEE_LIBCXXABI_SRC_DIR := @KLEE_LIBCXXABI_SRC_DIR@ KLEE_INCLUDE_DIR := @CMAKE_SOURCE_DIR@/include # Commands diff --git a/runtime/klee-eh-cxx/Makefile.cmake.bitcode b/runtime/klee-eh-cxx/Makefile.cmake.bitcode index f29b947d..aa314613 100644 --- a/runtime/klee-eh-cxx/Makefile.cmake.bitcode +++ b/runtime/klee-eh-cxx/Makefile.cmake.bitcode @@ -7,7 +7,7 @@ ARCHIVE_FILE=$(ARCHIVE_DEST)/libklee-eh-cxx.bca all: $(ARCHIVE_FILE) klee_eh_cxx.bc: $(SRC_DIR)/klee_eh_cxx.cpp - $(LLVMCXX) -nostdinc++ -emit-llvm -c -I$(KLEE_INCLUDE_DIR) -I $(KLEE_LIBCXXABI_DIR)/include -I $(KLEE_LIBCXXABI_DIR)/src -I $(KLEE_LIBCXX_INCLUDE_DIR) $(SRC_DIR)/klee_eh_cxx.cpp -o $@ + $(LLVMCXX) -nostdinc++ -emit-llvm -c -I$(KLEE_INCLUDE_DIR) -I $(KLEE_LIBCXXABI_SRC_DIR)/src -I $(KLEE_LIBCXXABI_SRC_DIR)/include -I $(KLEE_LIBCXX_INCLUDE_DIR) $(SRC_DIR)/klee_eh_cxx.cpp -o $@ $(ARCHIVE_FILE): klee_eh_cxx.bc $(LLVM_AR) rcs $@ $< -- cgit 1.4.1