Skip to content

Commit ff46b84

Browse files
committed
[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
1 parent 86888e4 commit ff46b84

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: libcxxabi/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -459,10 +459,10 @@ if (LIBCXXABI_USE_LLVM_UNWINDER OR LLVM_NATIVE_ARCH MATCHES ARM)
459459
if (LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL "LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL-NOTFOUND")
460460
set(LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL "")
461461
endif()
462+
endif()
462463

463-
if (NOT LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL STREQUAL "")
464-
include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}")
465-
endif()
464+
if (NOT "${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}" STREQUAL "")
465+
include_directories("${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}")
466466
endif()
467467

468468
# Add source code. This also contains all of the logic for deciding linker flags

0 commit comments

Comments
 (0)