diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-07-08 14:49:35 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-07-08 14:49:35 +0000 |
| commit | 945b9ec0693390ef35fe8c6b774495312246b8b6 (patch) | |
| tree | 19f88ebfaed99cead67f49452ab4546fe0025616 /libcxx/cmake/Modules | |
| parent | 74cbaa37b663994cc15f321125042702275dede8 (diff) | |
| download | bcm5719-llvm-945b9ec0693390ef35fe8c6b774495312246b8b6.tar.gz bcm5719-llvm-945b9ec0693390ef35fe8c6b774495312246b8b6.zip | |
[libc++] Take 2: Do not cleverly link against libc++abi just because it happens to be there
Summary:
Otherwise, when libcxxabi is not an enabled project in the monorepo, we
get a link error because we try to link against non-existent cxxabi_shared.
More generally, we shouldn't change the behavior of the build based on
implicit things like whether a file happens to be at a specific path or
not.
This is a re-application of r365222 that had been reverted in r365233
because it broke the build bots. However, the build bots now specify
explicitly what ABI library they want to use (libc++abi), so this
commit should now be OK to merge.
Differential Revision: https://reviews.llvm.org/D63883
llvm-svn: 365326
Diffstat (limited to 'libcxx/cmake/Modules')
| -rw-r--r-- | libcxx/cmake/Modules/HandleLibCXXABI.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake index 10f100f7f0f..57f9e32c5da 100644 --- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake +++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake @@ -98,7 +98,7 @@ if ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libstdc++" OR "${_LIBSUPCXX_LIBNAME}" "${_LIBSUPCXX_LIBNAME}" "${_LIBSUPCXX_INCLUDE_FILES}" "bits" ) elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi") - if (LIBCXX_CXX_ABI_INTREE) + if (TARGET cxxabi_shared AND TARGET cxxabi_static) # Link against just-built "cxxabi" target. set(CXXABI_SHARED_LIBNAME cxxabi_shared) set(CXXABI_STATIC_LIBNAME cxxabi_static) |
