[llvm] 654aa3a - Revert "[llvm] Partial revert, hopefully fix LLVM module maps build"

[Med Ismail Bennani via llvm-commits]

Author: Med Ismail Bennani
Date: 2021-12-10T17:33:54-08:00
New Revision: 654aa3ad92f2e496eb082cf07b3de3471ae58a92

URL: https://github.com/llvm/llvm-project/commit/654aa3ad92f2e496eb082cf07b3de3471ae58a92
DIFF: https://github.com/llvm/llvm-project/commit/654aa3ad92f2e496eb082cf07b3de3471ae58a92.diff

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

This reverts commit 8d897ec91528e943bf2be7356845d3428ae369ae.

I tentativily landed John's patch in D115553 to fix the macOS bots but
it's still failing as shown here:

https://green.lab.llvm.org/green/job/lldb-cmake/39267/

Signed-off-by: Med Ismail Bennani <medismail.bennani at gmail.com>

Added: 
    

Modified: 
    llvm/include/llvm/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/CMakeLists.txt b/llvm/include/llvm/CMakeLists.txt
index b46319f24fc8e..2feabd1954e40 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 module.modulemap COPYONLY)
+  configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY)
 endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")