[libcxx-commits] [libcxx] [libc++] Remove stray CMake install step for modulemap file (PR #89394)

Louis Dionne via libcxx-commits libcxx-commits at lists.llvm.org
Fri Apr 19 07:55:11 PDT 2024


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

The modulemap file is not generated anymore, so it's just part of our list of includes and gets installed like every other header. We don't need a special step to install it anymore. This was overlooked when I removed the generation of the modulemap file.

>From 64fc7e5e0b29a44615951c6916b3661dd604f270 Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 19 Apr 2024 10:53:58 -0400
Subject: [PATCH] [libc++] Remove stray CMake install step for modulemap file

The modulemap file is not generated anymore, so it's just part of our
list of includes and gets installed like every other header. We don't
need a special step to install it anymore. This was overlooked when I
removed the generation of the modulemap file.
---
 libcxx/include/CMakeLists.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index 4ecd834c5382ae..8c7dcfb6226166 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -1068,12 +1068,6 @@ if (LIBCXX_INSTALL_HEADERS)
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
     COMPONENT cxx-headers)
 
-  # Install the generated modulemap file to the generic include dir.
-  install(FILES "${LIBCXX_GENERATED_INCLUDE_DIR}/module.modulemap"
-    DESTINATION "${LIBCXX_INSTALL_INCLUDE_DIR}"
-    PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-    COMPONENT cxx-headers)
-
   if (NOT CMAKE_CONFIGURATION_TYPES)
     add_custom_target(install-cxx-headers
                       DEPENDS cxx-headers



More information about the libcxx-commits mailing list