diff options
| author | Martin Nowack <m.nowack@imperial.ac.uk> | 2023-10-12 10:28:42 +0100 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2024-02-08 13:17:19 +0000 |
| commit | f27b748ba2be259177aa672e4d5fc39d36479c7f (patch) | |
| tree | 86888ffd77bda047347953bfac350e59e43ec59c /runtime/klee-eh-cxx | |
| parent | fa3719ddf279e071b4046960c15452a00c6956a9 (diff) | |
| download | klee-f27b748ba2be259177aa672e4d5fc39d36479c7f.tar.gz | |
Add support for newer `libc++`; Simplify path detection
`libc++` include headers are now split between platform dependent and platform independent code. Before, only include files for the platform independent code were considered. Add support to automatically find platform dependent includes as well. Simplify the detection of libraries and paths. Instead of pointing to the `v1` directory, pointing to the include directory for `-DKLEE_LIBCXX_INCLUDE_PATH` is enough. Update build script to support this as well.
Diffstat (limited to 'runtime/klee-eh-cxx')
| -rw-r--r-- | runtime/klee-eh-cxx/CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/runtime/klee-eh-cxx/CMakeLists.txt b/runtime/klee-eh-cxx/CMakeLists.txt index e016757b..470e3f0a 100644 --- a/runtime/klee-eh-cxx/CMakeLists.txt +++ b/runtime/klee-eh-cxx/CMakeLists.txt @@ -16,8 +16,14 @@ set(ADDITIONAL_CXX_FLAGS -nostdinc++ -I "${KLEE_LIBCXXABI_SRC_DIR}/src" -I "${KLEE_LIBCXXABI_SRC_DIR}/include" - -I "${KLEE_LIBCXX_INCLUDE_DIR}" + -I "${KLEE_LIBCXX_INCLUDE_PATH}" +) + +if (KLEE_LIBCXX_PLATFORM_INCLUDE_PATH) + list(APPEND ADDITIONAL_CXX_FLAGS + -I "${KLEE_LIBCXX_PLATFORM_INCLUDE_PATH}" ) +endif () # Build it include("${CMAKE_SOURCE_DIR}/cmake/compile_bitcode_library.cmake") prefix_with_path("${SRC_FILES}" "${CMAKE_CURRENT_SOURCE_DIR}/" prefixed_files) |