[libcxx-commits] [libcxx] [libc++] Don't generate the modulemap file (PR #80352)

[Louis Dionne via libcxx-commits]

https://github.com/ldionne created https://github.com/llvm/llvm-project/pull/80352

We actually didn't generate anything in that file, so generating it via CMake is useless.

>From a87bab3a73027e02bb44ca8e17fd22e56e64e2df Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Thu, 1 Feb 2024 17:08:42 -0500
Subject: [PATCH] [libc++] Don't generate the modulemap file

We actually didn't generate anything in that file, so generating it
via CMake is useless.
---
 libcxx/docs/Contributing.rst                             | 2 +-
 libcxx/include/CMakeLists.txt                            | 1 -
 libcxx/include/{module.modulemap.in => module.modulemap} | 0
 libcxx/utils/libcxx/header_information.py                | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)
 rename libcxx/include/{module.modulemap.in => module.modulemap} (100%)

diff --git a/libcxx/docs/Contributing.rst b/libcxx/docs/Contributing.rst
index 596d86ef22449..90aabc9c4ff6f 100644
--- a/libcxx/docs/Contributing.rst
+++ b/libcxx/docs/Contributing.rst
@@ -156,7 +156,7 @@ sure you don't forget anything:
 - Did you add all new named declarations to the ``std`` module?
 - If you added a header:
 
-  - Did you add it to ``include/module.modulemap.in``?
+  - Did you add it to ``include/module.modulemap``?
   - Did you add it to ``include/CMakeLists.txt``?
   - If it's a public header, did you update ``utils/libcxx/header_information.py``?
 
diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index 0bb23710cae84..a0bea5d19127e 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -1024,7 +1024,6 @@ foreach(feature LIBCXX_ENABLE_FILESYSTEM LIBCXX_ENABLE_LOCALIZATION LIBCXX_ENABL
 endforeach()
 
 configure_file("__config_site.in" "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site" @ONLY)
-configure_file("module.modulemap.in" "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap" @ONLY)
 configure_file("${LIBCXX_ASSERTION_HANDLER_FILE}" "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler" COPYONLY)
 
 set(_all_includes "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site"
diff --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap
similarity index 100%
rename from libcxx/include/module.modulemap.in
rename to libcxx/include/module.modulemap
diff --git a/libcxx/utils/libcxx/header_information.py b/libcxx/utils/libcxx/header_information.py
index b2aa3739ea697..bccae353b0c6b 100644
--- a/libcxx/utils/libcxx/header_information.py
+++ b/libcxx/utils/libcxx/header_information.py
@@ -155,7 +155,6 @@
 def is_header(file):
     """Returns whether the given file is a header (i.e. not a directory or the modulemap file)."""
     return not file.is_dir() and not file.name in [
-        "module.modulemap.in",
         "module.modulemap",
         "CMakeLists.txt",
         "libcxx.imp",