diff options
| author | a-n-n-a-l-e-e <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2024-01-11 14:07:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-11 17:07:11 -0500 |
| commit | b3981edb51bf36480b8b2c9d6969725ddbcadcfb (patch) | |
| tree | 5e77033c3ee72d09d9f6d79dffb4eef6dc8b34f6 /libcxx/src | |
| parent | 7740565f56ce888f5c60d986476185477c911b25 (diff) | |
| download | llvm-b3981edb51bf36480b8b2c9d6969725ddbcadcfb.zip llvm-b3981edb51bf36480b8b2c9d6969725ddbcadcfb.tar.gz llvm-b3981edb51bf36480b8b2c9d6969725ddbcadcfb.tar.bz2 | |
[libc++] Re-export libc++abi symbols on Apple platforms when using system-libcxxabi (#77218)
When using LIBCXX_CXX_ABI=system-libcxxabi on Apple platforms, we would not
re-export the libc++abi symbols unlike when LIBCXX_CXX_ABI=libcxxabi. This
was caused by overly strict string matching in CMake.
https://github.com/NixOS/nixpkgs/issues/269548
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt index 96e7c63..dc2c981 100644 --- a/libcxx/src/CMakeLists.txt +++ b/libcxx/src/CMakeLists.txt @@ -230,7 +230,7 @@ if (LIBCXX_ENABLE_SHARED) # 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 STREQUAL "libcxxabi" + if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$" AND NOT DEFINED LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY) set(LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS ON) |