[llvm] 4516e63 - [compiler-rt] Pass the CMake binary dir directly (#102493)

[via llvm-commits]

Author: Joseph Huber
Date: 2024-08-08T12:32:30-05:00
New Revision: 4516e631554ef05cfe38600097c7993be538c636

URL: https://github.com/llvm/llvm-project/commit/4516e631554ef05cfe38600097c7993be538c636
DIFF: https://github.com/llvm/llvm-project/commit/4516e631554ef05cfe38600097c7993be538c636.diff

LOG: [compiler-rt] Pass the CMake binary dir directly (#102493)

Summary:
The usage of `LLVM_CMAKE_DIR` is confusing in CMake, because in LLVM it
refers to `llvm/cmake/modules/` while compiler-rt wants the `build/` dir
for finding LLVM. THis passes it manually.

Added: 
    

Modified: 
    llvm/runtimes/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
index 42b1b86ebaadf0..5a4435bc96e0c8 100644
--- a/llvm/runtimes/CMakeLists.txt
+++ b/llvm/runtimes/CMakeLists.txt
@@ -89,6 +89,7 @@ function(builtin_default_target compiler_rt_path)
                                       -DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
                                       -DLLVM_DEFAULT_TARGET_TRIPLE=${LLVM_TARGET_TRIPLE}
                                       -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR}
+                                      -DLLVM_CMAKE_DIR=${CMAKE_BINARY_DIR}
                                       -DCMAKE_C_COMPILER_WORKS=ON
                                       -DCMAKE_ASM_COMPILER_WORKS=ON
                                       ${COMMON_CMAKE_ARGS}
@@ -128,6 +129,7 @@ function(builtin_register_target compiler_rt_path name)
                            CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR}
                                       -DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
                                       -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
+                                      -DLLVM_CMAKE_DIR=${CMAKE_BINARY_DIR}
                                       -DCMAKE_C_COMPILER_WORKS=ON
                                       -DCMAKE_ASM_COMPILER_WORKS=ON
                                       -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON