diff options
| author | Louis Dionne <ldionne.2@gmail.com> | 2024-03-04 18:16:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-04 18:16:16 -0500 |
| commit | 6fd27d5b0321f65c8a09624e456e33874ae3730b (patch) | |
| tree | fe8c86967a7294aca39e04e996ebb86f491ced69 /libcxx | |
| parent | 82cc2a67014deb1ad7509eeb287ffd8e7fa1ea1b (diff) | |
| download | llvm-6fd27d5b0321f65c8a09624e456e33874ae3730b.zip llvm-6fd27d5b0321f65c8a09624e456e33874ae3730b.tar.gz llvm-6fd27d5b0321f65c8a09624e456e33874ae3730b.tar.bz2 | |
[libc++] Don't generate the modulemap file (#80352)
We actually didn't generate anything in that file, so generating it via
CMake is useless.
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/docs/Contributing.rst | 2 | ||||
| -rw-r--r-- | libcxx/include/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | libcxx/include/module.modulemap (renamed from libcxx/include/module.modulemap.in) | 0 | ||||
| -rw-r--r-- | libcxx/test/libcxx/lint/lint_headers.sh.py | 2 | ||||
| -rw-r--r-- | libcxx/utils/libcxx/header_information.py | 1 |
5 files changed, 3 insertions, 11 deletions
diff --git a/libcxx/docs/Contributing.rst b/libcxx/docs/Contributing.rst index 596d86e..90aabc9 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 459b077..3ea3360 100644 --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -968,6 +968,7 @@ set(files mdspan memory memory_resource + module.modulemap mutex new numbers @@ -1021,18 +1022,10 @@ set(files wctype.h ) -foreach(feature LIBCXX_ENABLE_FILESYSTEM LIBCXX_ENABLE_LOCALIZATION LIBCXX_ENABLE_THREADS LIBCXX_ENABLE_WIDE_CHARACTERS) - if (NOT ${${feature}}) - set(requires_${feature} "requires LIBCXX_CONFIGURED_WITHOUT_SUPPORT_FOR_THIS_HEADER") - endif() -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" - "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap" "${LIBCXX_GENERATED_INCLUDE_DIR}/__assertion_handler") foreach(f ${files}) set(src "${CMAKE_CURRENT_SOURCE_DIR}/${f}") diff --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap index b247f97..b247f97 100644 --- a/libcxx/include/module.modulemap.in +++ b/libcxx/include/module.modulemap diff --git a/libcxx/test/libcxx/lint/lint_headers.sh.py b/libcxx/test/libcxx/lint/lint_headers.sh.py index ab237c9..c5e582c 100644 --- a/libcxx/test/libcxx/lint/lint_headers.sh.py +++ b/libcxx/test/libcxx/lint/lint_headers.sh.py @@ -11,7 +11,7 @@ import re def exclude_from_consideration(path): return ( path.endswith(".txt") - or path.endswith(".modulemap.in") + or path.endswith(".modulemap") or os.path.basename(path) == "__config" or os.path.basename(path) == "__config_site.in" or os.path.basename(path) == "libcxx.imp" diff --git a/libcxx/utils/libcxx/header_information.py b/libcxx/utils/libcxx/header_information.py index b2aa373..bccae35 100644 --- a/libcxx/utils/libcxx/header_information.py +++ b/libcxx/utils/libcxx/header_information.py @@ -155,7 +155,6 @@ headers_not_available = [ 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", |