diff options
| author | Louis Dionne <ldionne@apple.com> | 2019-03-20 18:16:24 +0000 |
|---|---|---|
| committer | Louis Dionne <ldionne@apple.com> | 2019-03-20 18:16:24 +0000 |
| commit | 2d0b4d6bb3c12278d60ef7c957c0dba77d81dc95 (patch) | |
| tree | 65daa94c9fef9c1f7d516fe0efb959645ae0d550 /libcxx/cmake | |
| parent | 00b5ecab5d8133fe437cf4668b46cb5d2716447f (diff) | |
| download | bcm5719-llvm-2d0b4d6bb3c12278d60ef7c957c0dba77d81dc95.tar.gz bcm5719-llvm-2d0b4d6bb3c12278d60ef7c957c0dba77d81dc95.zip | |
[libc++][CMake] Clean up some of the libc++ re-exporting logic
Summary:
This change allows specifying the version of libc++abi's ABI to re-export
when configuring CMake. It also clearly identifies which ABI version of
libc++abi each export file contains.
Finally, it removes hardcoded knowledge about the 10.9 SDK for MacOS,
since that knowledge is not relevant anymore. Indeed, libc++ can't be
built with the toolchain that came with the 10.9 SDK anyway because
the version of Clang it includes is too old (for example if you want
to build a working libc++.dylib, you need bugfixes to visibility
attributes that are only in recent Clangs).
Reviewers: dexonsmith, EricWF
Subscribers: mgorny, christof, jkorous, arphaman, libcxx-commits
Differential Revision: https://reviews.llvm.org/D59489
llvm-svn: 356587
Diffstat (limited to 'libcxx/cmake')
| -rw-r--r-- | libcxx/cmake/Modules/HandleLibCXXABI.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake index 89f2e97d8b1..44c59a57341 100644 --- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake +++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake @@ -103,7 +103,6 @@ elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi") else() set(CXXABI_LIBNAME cxxabi_shared) endif() - set(LIBCXX_LIBCPPABI_VERSION "2" PARENT_SCOPE) else() # Assume c++abi is installed in the system, rely on -lc++abi link flag. set(CXXABI_LIBNAME "c++abi") |

