commit afaa2bd389f448fef6ed21561f6376f97ccac0ce
author Louis Dionne <ldionne.2@gmail.com> Fri Jan 22 12:39:17 2021 -0500
committer Copybara-Service <copybara-worker@google.com> Sun Jan 24 20:47:43 2021 -0800
tree 9eaf43814fb402eece47b4292b729f6d466fd677
parent 31ad7e7b27d32ab4a56b929291dc9ef3c6eabc30

[libc++] Fix broken build when merging libc++abi into libc++ on Apple

GitOrigin-RevId: 03b6dc300531434209e65bccebb1a1c21f387e2a

src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 52b68e5..c482068 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -213,9 +213,12 @@
   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()