diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-11-14 03:03:13 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-11-14 03:03:13 +0000 |
| commit | 209a39706011a6882fc3c9cbf28db75c96f6bdca (patch) | |
| tree | 864fdcb3d6bb2d7b9c5dc97e28d904c36c30cd64 | |
| parent | 310891f29ad81c58babd6ac9cd48d5572257ceec (diff) | |
| download | bcm5719-llvm-209a39706011a6882fc3c9cbf28db75c96f6bdca.tar.gz bcm5719-llvm-209a39706011a6882fc3c9cbf28db75c96f6bdca.zip | |
Fix ABI configuration detection on OS X
llvm-svn: 286792
| -rw-r--r-- | libcxx/lib/abi/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libcxx/lib/abi/CMakeLists.txt b/libcxx/lib/abi/CMakeLists.txt index b522c192e38..c545ab2bcbd 100644 --- a/libcxx/lib/abi/CMakeLists.txt +++ b/libcxx/lib/abi/CMakeLists.txt @@ -4,13 +4,15 @@ if (DEFINED TARGET_TRIPLE AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/${TARGET_TRIPLE}.abilist" AND TARGET cxx_shared - AND "${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi" + AND ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi" OR + (APPLE AND "${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "none")) AND NOT LIBCXX_ABI_UNSTABLE AND LIBCXX_ABI_VERSION EQUAL "1") set(LIBCXX_HAS_ABILIST_CONFIGURATION 1 CACHE INTERNAL "") else() if (NOT DEFINED LIBCXX_HAS_ABILIST_CONFIGURATION) - message(STATUS "libc++ configuration differs from the abilist configuration. check-cxx-abilist target is not supported") + message(STATUS "libc++ configuration differs from the abilist configuration. " + "check-cxx-abilist target is not supported") endif() set(LIBCXX_HAS_ABILIST_CONFIGURATION 0 CACHE INTERNAL "") endif() |
