diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-07-23 05:07:44 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-07-23 05:07:44 +0000 |
| commit | 781ee0bc5abade62a306873aa8fb47ea4d75fdf2 (patch) | |
| tree | cfcbf896ac4e1cb8571215676edd9db009ba3579 /libcxx/cmake | |
| parent | c50ef8560ab41015c25013b2a0aeedca53e08f56 (diff) | |
| download | bcm5719-llvm-781ee0bc5abade62a306873aa8fb47ea4d75fdf2.tar.gz bcm5719-llvm-781ee0bc5abade62a306873aa8fb47ea4d75fdf2.zip | |
Revert "[CMake] Support statically linking dependencies only to shared or static library"
This reverts commit r337668: broke the cxxabi build when using Make.
llvm-svn: 337670
Diffstat (limited to 'libcxx/cmake')
| -rw-r--r-- | libcxx/cmake/Modules/HandleLibCXXABI.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake index d837c3c3758..0eb70a739d5 100644 --- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake +++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake @@ -96,10 +96,10 @@ if ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libstdc++" OR elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi") if (LIBCXX_CXX_ABI_INTREE) # Link against just-built "cxxabi" target. - if (LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY) - set(CXXABI_LIBNAME cxxabi_static) + if (LIBCXX_ENABLE_STATIC_ABI_LIBRARY) + set(CXXABI_LIBNAME cxxabi_static) else() - set(CXXABI_LIBNAME cxxabi_shared) + set(CXXABI_LIBNAME cxxabi_shared) endif() set(LIBCXX_LIBCPPABI_VERSION "2" PARENT_SCOPE) else() |
