diff options
author | Louis Dionne <ldionne@apple.com> | 2019-07-05 17:06:23 +0000 |
---|---|---|
committer | Louis Dionne <ldionne@apple.com> | 2019-07-05 17:06:23 +0000 |
commit | 4ba29e5fbeaf359b8ab07c902b8ad48c899eaec3 (patch) | |
tree | e9e97cd2583d068b7a460a8943e6ce399af256c0 /libcxx/cmake | |
parent | 9e38f510b37d5a8e750eec60e123e3a98803b294 (diff) | |
download | bcm5719-llvm-4ba29e5fbeaf359b8ab07c902b8ad48c899eaec3.tar.gz bcm5719-llvm-4ba29e5fbeaf359b8ab07c902b8ad48c899eaec3.zip |
[libc++] 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.
Reviewers: EricWF
Subscribers: mgorny, christof, jkorous, dexonsmith, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D63883
llvm-svn: 365222
Diffstat (limited to 'libcxx/cmake')
-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) |