[SystemZ][z/OS] Make LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL available for external unwind library.

[zibi]

Summary

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.

[zibi]

• fix CI

[zibi]

The CI failure is unrelated with 1 timeout:

TIMEOUT: llvm-libc++-shared.cfg.in :: std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_one.pass.cpp (5780 of 8044)

[zibi]

ping

[muiez]

LGTM

[zibi]

This is already reviewed and accepted but blocked by libc++abi group.
Can I have somebody from libc++abi to have a peek at this patch?

[zibi]

Ping, can I can the approval?
This is a minor patch which should not take to loog.

[phosek]

LGTM

[SeanP]

LGTM

libcxxabi/CMakeLists.txt

PATHS ${LIBCXXABI_LIBUNWIND_INCLUDES}
           ${LLVM_MAIN_SRC_DIR}/../libunwind/include
     NO_DEFAULT_PATH
     NO_CMAKE_FIND_ROOT_PATH
   )
 
   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()
-endif()
+if (NOT "${LIBCXXABI_LIBUNWIND_INCLUDES_INTERNAL}" STREQUAL "")
 
 # Add source code. This also contains all of the logic for deciding linker flags
 # soname, etc...
 add_subdirectory(include)
 add_subdirectory(src)
 
 if (LIBCXXABI_INCLUDE_TESTS)
   add_subdirectory(test)
   add_subdirectory(fuzz)
 endif()