[llvm] e5f3260 - [gn] Port 860e88411d94

[Daniel Bertalan via llvm-commits]

Author: Daniel Bertalan
Date: 2025-04-18T22:16:42+02:00
New Revision: e5f326044fdca0ba8a4ce42cafd0927776bcabff

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

LOG: [gn] Port 860e88411d94

Added: 
    

Modified: 
    llvm/utils/gn/secondary/libcxx/include/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
index aba30f9ce063f..f1d5c86240b4a 100644
--- a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
@@ -65,6 +65,13 @@ if (current_toolchain == default_toolchain) {
     values = []
   }
 
+  write_cmake_config("write_modulemap") {
+    input = "module.modulemap.in"
+    output = "$libcxx_generated_include_dir/module.modulemap"
+    values =
+        [ "LIBCXX_CONFIG_SITE_MODULE_ENTRY=textual header \"__config_site\"" ]
+  }
+
   copy("copy_headers") {
     sources = [
       "__algorithm/adjacent_find.h",
@@ -1677,7 +1684,6 @@ if (current_toolchain == default_toolchain) {
       "mdspan",
       "memory",
       "memory_resource",
-      "module.modulemap",
       "mutex",
       "new",
       "numbers",
@@ -1732,6 +1738,7 @@ if (current_toolchain == default_toolchain) {
     deps = [
       ":write_assertion_handler",
       ":write_config_site",
+      ":write_modulemap",
     ]
     if (target_os != "mac" && target_os != "win") {
       # libcxx/cmake/Modules/HandleLibCXXABI.cmake sets