Skip to content

Commit 4117dc8

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 9258f3e commit 4117dc8

File tree

4 files changed

+1
-3
lines changed

4 files changed

+1
-3
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,6 @@ foreach(feature LIBCXX_ENABLE_FILESYSTEM LIBCXX_ENABLE_LOCALIZATION LIBCXX_ENABL
10231023
endforeach()
10241024

10251025
configure_file("__config_site.in" "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site" @ONLY)
1026-
configure_file("module.modulemap.in" "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap" @ONLY)
10271026
configure_file("${LIBCXX_ASSERTION_HANDLER_FILE}" "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler" COPYONLY)
10281027

10291028
set(_all_includes "${LIBCXX_GENERATED_INCLUDE_TARGET_DIR}/__config_site"
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)