diff options
| author | Louis Dionne <ldionne.2@gmail.com> | 2021-01-22 12:39:17 -0500 |
|---|---|---|
| committer | Louis Dionne <ldionne.2@gmail.com> | 2021-01-22 12:39:40 -0500 |
| commit | 03b6dc300531434209e65bccebb1a1c21f387e2a (patch) | |
| tree | 87423c5f7c5f106f0f53b79145647f6a039e5d5b /libcxx | |
| parent | edbcc17b7a0b5a4f20ec55983e172d0120ccbca9 (diff) | |
| download | llvm-03b6dc300531434209e65bccebb1a1c21f387e2a.zip llvm-03b6dc300531434209e65bccebb1a1c21f387e2a.tar.gz llvm-03b6dc300531434209e65bccebb1a1c21f387e2a.tar.bz2 | |
[libc++] Fix broken build when merging libc++abi into libc++ on Apple
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/src/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt index 52b68e5..c482068 100644 --- a/libcxx/src/CMakeLists.txt +++ b/libcxx/src/CMakeLists.txt @@ -213,9 +213,12 @@ if (LIBCXX_ENABLE_SHARED) endif() # Maybe re-export symbols from libc++abi + # In particular, we don't re-export the symbols if libc++abi is merged statically + # into libc++ because in that case there's no dylib to re-export from. if (APPLE AND (LIBCXX_CXX_ABI_LIBNAME STREQUAL "libcxxabi" OR LIBCXX_CXX_ABI_LIBNAME STREQUAL "default") - AND NOT DEFINED LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS) + AND NOT DEFINED LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS + AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY) set(LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS ON) endif() |