[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
Mon Apr 22 05:46:51 PDT 2024


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

>From 07956caa506b7ccb0f4dd3b0773eedef3d1f74fe 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 8269436a53e9a9..1296c536bc882c 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -1076,12 +1076,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)
-
   # Install the generated IWYU file to the generic include dir.
   install(FILES "${LIBCXX_GENERATED_INCLUDE_DIR}/libcxx.imp"
     DESTINATION "${LIBCXX_INSTALL_INCLUDE_DIR}"



More information about the libcxx-commits mailing list