Skip to content

Commit cc2789e

Browse files
committed
[libc++] Don't generate the modulemap file
We actually didn't generate anything in that file, so generating it via CMake is useless.
1 parent 341d3a5 commit cc2789e

File tree

4 files changed

+2
-10
lines changed

4 files changed

+2
-10
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
@@ -965,6 +965,7 @@ set(files
965965
mdspan
966966
memory
967967
memory_resource
968+
module.modulemap
968969
mutex
969970
new
970971
numbers
@@ -1018,18 +1019,10 @@ set(files
10181019
wctype.h
10191020
)
10201021

1021-
foreach(feature LIBCXX_ENABLE_FILESYSTEM LIBCXX_ENABLE_LOCALIZATION LIBCXX_ENABLE_THREADS LIBCXX_ENABLE_WIDE_CHARACTERS)
1022-
if (NOT ${${feature}})
1023-
set(requires_${feature} "requires LIBCXX_CONFIGURED_WITHOUT_SUPPORT_FOR_THIS_HEADER")
1024-
endif()
1025-
endforeach()
1026-
10271022
configure_file("__config_site.in" "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site" @ONLY)
1028-
configure_file("module.modulemap.in" "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap" @ONLY)
10291023
configure_file("${LIBCXX_ASSERTION_HANDLER_FILE}" "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler" COPYONLY)
10301024

10311025
set(_all_includes "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site"
1032-
"${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap"
10331026
"${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler")
10341027
foreach(f ${files})
10351028
set(src "${CMAKE_CURRENT_SOURCE_DIR}/${f}")
File renamed without changes.

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)