diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt index 96e7c6362d8c..dc2c98188aac 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)