[llvm-branch-commits] [libcxx] 03b6dc3 - [libc++] Fix broken build when merging libc++abi into libc++ on Apple

[Louis Dionne via llvm-branch-commits]

Author: Louis Dionne
Date: 2021-01-22T12:39:40-05:00
New Revision: 03b6dc300531434209e65bccebb1a1c21f387e2a

URL: https://github.com/llvm/llvm-project/commit/03b6dc300531434209e65bccebb1a1c21f387e2a
DIFF: https://github.com/llvm/llvm-project/commit/03b6dc300531434209e65bccebb1a1c21f387e2a.diff

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

Added: 
    

Modified: 
    libcxx/src/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
index 52b68e50dd4e..c482068fa99a 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()