diff options
| author | Zibi Sarbinowski <zibi@ca.ibm.com> | 2023-04-21 11:29:36 -0500 |
|---|---|---|
| committer | Zibi Sarbinowski <zibi@ca.ibm.com> | 2023-04-21 11:36:30 -0500 |
| commit | ff46b844165f7b611548333c77246244ec21e104 (patch) | |
| tree | 9e7ecabac8705efae8666eeefe825e9689cb92e9 /libcxxabi | |
| parent | 86888e420c41ebb07fa1a8818ea9af218b015fe3 (diff) | |
| download | llvm-ff46b844165f7b611548333c77246244ec21e104.tar.gz | |
[SystemZ][z/OS] Make LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL available for external unwind library.
On z/OS, we need to pass the location of unwind interface header when building cxxabi. The cmake macro `LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL` is available for this purpose but it is only used with conjunction with `LIBCXXABI_USE_LLVM_UNWINDER`. For the external unwind library we need to use LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL unconditionally whenever it is set.
Reviewed By: #libc_abi, muiez, phosek, SeanP
Differential Revision: https://reviews.llvm.org/D147460
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index 9239274d7af1..ae89796f6fcf 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -459,10 +459,10 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM) if (LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL "LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL-NOTFOUND") set(LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL "") endif() +endif() - if (NOT LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL "") - include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}") - endif() +if (NOT "${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}" STREQUAL "") + include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}") endif() # Add source code. This also contains all of the logic for deciding linker flags |