[llvm] f836048 - [gn] port 6fd27d5b0321f (no more module.modulemap.in)

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2024-03-05T12:03:53-05:00
New Revision: f836048a2b452f5f2a8440c9f5945ee1a7bcdac2

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

LOG: [gn] port 6fd27d5b0321f (no more module.modulemap.in)

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 5ba0d04b47452e..72aa8b4e8e387b 100644
--- a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
@@ -58,14 +58,6 @@ if (current_toolchain == default_toolchain) {
     }
   }
 
-  write_cmake_config("write_modulemap") {
-    input = "module.modulemap.in"
-    output = "$libcxx_generated_include_dir/module.modulemap"
-
-    #no = "requires LIBCXX_CONFIGURED_WITHOUT_SUPPORT_FOR_THIS_HEADER"
-    values = []
-  }
-
   # This uses write_cmake_config() instead of a normal copy() rule because
   # copy() uses `sources`, and if there's more than one `sources` in a file,
   # sync_source_lists_from_cmake.py can't auto-sync changes.
@@ -1042,6 +1034,7 @@ if (current_toolchain == default_toolchain) {
       "mdspan",
       "memory",
       "memory_resource",
+      "module.modulemap",
       "mutex",
       "new",
       "numbers",
@@ -1097,7 +1090,6 @@ 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