[llvm] 8d897ec - [llvm] Partial revert, hopefully fix LLVM module maps build

Med Ismail Bennani via llvm-commits llvm-commits at lists.llvm.org
Fri Dec 10 17:18:08 PST 2021


Author: John Ericson
Date: 2021-12-10T17:17:01-08:00
New Revision: 8d897ec91528e943bf2be7356845d3428ae369ae

URL: https://github.com/llvm/llvm-project/commit/8d897ec91528e943bf2be7356845d3428ae369ae
DIFF: https://github.com/llvm/llvm-project/commit/8d897ec91528e943bf2be7356845d3428ae369ae.diff

LOG: [llvm] Partial revert, hopefully fix LLVM module maps build

In 492de35df443d5f31480173d5f1274c7835cd3d8 / D115544 I accidentally
added ${LLVM_INCLUDE_DIR}/ to the destination path. This broke the
"LLDB Incremental" build. Putting it back the way it was should fix it.

Differencial Revision: https://reviews.llvm.org/D115553

Added: 
    

Modified: 
    llvm/include/llvm/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/CMakeLists.txt b/llvm/include/llvm/CMakeLists.txt
index 2feabd1954e40..b46319f24fc8e 100644
--- a/llvm/include/llvm/CMakeLists.txt
+++ b/llvm/include/llvm/CMakeLists.txt
@@ -5,5 +5,5 @@ add_subdirectory(Frontend)
 # If we're doing an out-of-tree build, copy a module map for generated
 # header files into the build area.
 if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-  configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY)
+  configure_file(module.modulemap.build module.modulemap COPYONLY)
 endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")


        


More information about the llvm-commits mailing list