diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-02-10 05:07:03 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-02-10 05:07:03 +0000 |
| commit | 7f15e08ca161729473346dad7d64336cf50bdc5f (patch) | |
| tree | 20ec2d09a36113befda034876646df428720f32b /libcxx/cmake/Modules | |
| parent | a9f1121896a1f39744f0c23bc74762759aa798f1 (diff) | |
| download | bcm5719-llvm-7f15e08ca161729473346dad7d64336cf50bdc5f.tar.gz bcm5719-llvm-7f15e08ca161729473346dad7d64336cf50bdc5f.zip | |
Correctly default to using the system libc++abi on Apple.
This patch fixes a regression where libc++ didn't correctly
select the system libc++abi when no in-tree version was found.
llvm-svn: 294712
Diffstat (limited to 'libcxx/cmake/Modules')
| -rw-r--r-- | libcxx/cmake/Modules/HandleLibCXXABI.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake index 182565f52d2..b404e36c148 100644 --- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake +++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake @@ -103,9 +103,11 @@ elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi") # Assume c++abi is installed in the system, rely on -lc++abi link flag. set(CXXABI_LIBNAME "c++abi") endif() - setup_abi_lib("-DLIBCXX_BUILDING_LIBCXXABI" - ${CXXABI_LIBNAME} "cxxabi.h;__cxxabi_config.h" "" - ) + set(HEADERS "cxxabi.h;__cxxabi_config.h") + if (LIBCXX_CXX_ABI_SYSTEM) + set(HEADERS "") + endif() + setup_abi_lib("-DLIBCXX_BUILDING_LIBCXXABI" ${CXXABI_LIBNAME} "${HEADERS}" "") elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxrt") setup_abi_lib("-DLIBCXXRT" "cxxrt" "cxxabi.h;unwind.h;unwind-arm.h;unwind-itanium.h" "" |
