[libcxx-commits] [PATCH] D129271: [libcxx] Make LIBCXX_HERMETIC_STATIC_LIBRARY apply to libc++experimental too

[Martin Storsjö via Phabricator via libcxx-commits]

mstorsjo updated this revision to Diff 443046.
mstorsjo added a comment.

Removed the setting of `CXX_STATIC_LIBRARY_FLAGS` for `cxx_+experimental`, as it probably isn't needed. Will push later when CI has passed.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D129271/new/

https://reviews.llvm.org/D129271

Files:
  libcxx/src/CMakeLists.txt
  libcxx/test/libcxx/vendor/clang-cl/experimental-lib-exports.sh.cpp
  libcxx/test/libcxx/vendor/mingw/experimental-lib-exports.sh.cpp


Index: libcxx/test/libcxx/vendor/mingw/experimental-lib-exports.sh.cpp
===================================================================
--- /dev/null
+++ libcxx/test/libcxx/vendor/mingw/experimental-lib-exports.sh.cpp
@@ -0,0 +1,14 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// REQUIRES: target={{.+}}-windows-gnu && c++experimental
+
+// This file checks that the built experimental static library doesn't contain dllexport
+// directives in MinGW builds.
+
+// RUN: llvm-readobj --coff-directives "%{lib}/libc++experimental.a" | not grep -i "export:" > /dev/null
Index: libcxx/test/libcxx/vendor/clang-cl/experimental-lib-exports.sh.cpp
===================================================================
--- /dev/null
+++ libcxx/test/libcxx/vendor/clang-cl/experimental-lib-exports.sh.cpp
@@ -0,0 +1,14 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// REQUIRES: msvc && c++experimental
+
+// This file checks that the built experimental static library doesn't contain dllexport
+// directives in clang-cl builds.
+
+// RUN: llvm-readobj --coff-directives "%{lib}/libc++experimental.lib" | not grep -i "export:" > /dev/null
Index: libcxx/src/CMakeLists.txt
===================================================================
--- libcxx/src/CMakeLists.txt
+++ libcxx/src/CMakeLists.txt
@@ -332,6 +332,12 @@
       OUTPUT_NAME   "c++experimental"
   )
   cxx_add_common_build_flags(cxx_experimental)
+
+  if (LIBCXX_HERMETIC_STATIC_LIBRARY)
+    # _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS can be defined in __config_site
+    # too. Define it in the same way here, to avoid redefinition conflicts.
+    target_compile_definitions(cxx_experimental PRIVATE _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS=)
+  endif()
 endif()
 
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D129271.443046.patch
Type: text/x-patch
Size: 2396 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220707/889fb35a/attachment.bin>