Skip to content

Commit b3981ed

Browse files
author
a-n-n-a-l-e-e
authored
[libc++] Re-export libc++abi symbols on Apple platforms when using system-libcxxabi (llvm#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. NixOS/nixpkgs#269548
1 parent 7740565 commit b3981ed

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

libcxx/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ if (LIBCXX_ENABLE_SHARED)
230230
# Maybe re-export symbols from libc++abi
231231
# In particular, we don't re-export the symbols if libc++abi is merged statically
232232
# into libc++ because in that case there's no dylib to re-export from.
233-
if (APPLE AND LIBCXX_CXX_ABI STREQUAL "libcxxabi"
233+
if (APPLE AND LIBCXX_CXX_ABI MATCHES "libcxxabi$"
234234
AND NOT DEFINED LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS
235235
AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY)
236236
set(LIBCXX_OSX_REEXPORT_LIBCXXABI_SYMBOLS ON)

0 commit comments

Comments
 (0)