[libcxx] [libcxxabi] Set flags for visibility when statically linking libcxxabi into libcxx for windows
Previously, these had to be set manually when building each of the
projects standalone, in order to get proper symbol visibility when
combining the two libraries.
Differential Revision: https://reviews.llvm.org/D90021
GitOrigin-RevId: 8a73aa8c4c3ee82e7d650c6a957937713a4a9ab4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8cdb18..146749f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -288,7 +288,14 @@
# Disable DLL annotations on Windows for static builds.
if (WIN32 AND LIBCXXABI_ENABLE_STATIC AND NOT LIBCXXABI_ENABLE_SHARED)
- add_definitions(-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS)
+ if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_STATIC_ABI_LIBRARY)
+ # Building libcxxabi statically, but intending for it to be statically
+ # linked into a shared libcxx; keep dllexport enabled within libcxxabi,
+ # as the symbols will need to be exported from libcxx.
+ else()
+ # Regular static build; disable dllexports.
+ add_definitions(-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS)
+ endif()
endif()
add_compile_flags_if_supported(-Werror=return-type)
