Skip to content

Commit 6fd27d5

Browse files
authored
[libc++] Don't generate the modulemap file (llvm#80352)
We actually didn't generate anything in that file, so generating it via CMake is useless.
1 parent 82cc2a6 commit 6fd27d5

File tree

5 files changed

+3
-11
lines changed

5 files changed

+3
-11
lines changed

libcxx/docs/Contributing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ sure you don't forget anything:
156156
- Did you add all new named declarations to the ``std`` module?
157157
- If you added a header:
158158

159-
- Did you add it to ``include/module.modulemap.in``?
159+
- Did you add it to ``include/module.modulemap``?
160160
- Did you add it to ``include/CMakeLists.txt``?
161161
- If it's a public header, did you update ``utils/libcxx/header_information.py``?
162162

libcxx/include/CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,7 @@ set(files
968968
mdspan
969969
memory
970970
memory_resource
971+
module.modulemap
971972
mutex
972973
new
973974
numbers
@@ -1021,18 +1022,10 @@ set(files
10211022
wctype.h
10221023
)
10231024

1024-
foreach(feature LIBCXX_ENABLE_FILESYSTEM LIBCXX_ENABLE_LOCALIZATION LIBCXX_ENABLE_THREADS LIBCXX_ENABLE_WIDE_CHARACTERS)
1025-
if (NOT ${${feature}})
1026-
set(requires_${feature} "requires LIBCXX_CONFIGURED_WITHOUT_SUPPORT_FOR_THIS_HEADER")
1027-
endif()
1028-
endforeach()
1029-
10301025
configure_file("__config_site.in" "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site" @ONLY)
1031-
configure_file("module.modulemap.in" "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap" @ONLY)
10321026
configure_file("${LIBCXX_ASSERTION_HANDLER_FILE}" "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler" COPYONLY)
10331027

10341028
set(_all_includes "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site"
1035-
"${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap"
10361029
"${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler")
10371030
foreach(f ${files})
10381031
set(src "${CMAKE_CURRENT_SOURCE_DIR}/${f}")
File renamed without changes.

libcxx/test/libcxx/lint/lint_headers.sh.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
def exclude_from_consideration(path):
1212
return (
1313
path.endswith(".txt")
14-
or path.endswith(".modulemap.in")
14+
or path.endswith(".modulemap")
1515
or os.path.basename(path) == "__config"
1616
or os.path.basename(path) == "__config_site.in"
1717
or os.path.basename(path) == "libcxx.imp"

libcxx/utils/libcxx/header_information.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
def is_header(file):
156156
"""Returns whether the given file is a header (i.e. not a directory or the modulemap file)."""
157157
return not file.is_dir() and not file.name in [
158-
"module.modulemap.in",
159158
"module.modulemap",
160159
"CMakeLists.txt",
161160
"libcxx.imp",

0 commit comments

Comments
 (0)