Skip to content

Commit 4516e63

Browse files
authored
[compiler-rt] Pass the CMake binary dir directly (llvm#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.
1 parent 5ab7b0d commit 4516e63

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

llvm/runtimes/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ function(builtin_default_target compiler_rt_path)
8989
-DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
9090
-DLLVM_DEFAULT_TARGET_TRIPLE=${LLVM_TARGET_TRIPLE}
9191
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR}
92+
-DLLVM_CMAKE_DIR=${CMAKE_BINARY_DIR}
9293
-DCMAKE_C_COMPILER_WORKS=ON
9394
-DCMAKE_ASM_COMPILER_WORKS=ON
9495
${COMMON_CMAKE_ARGS}
@@ -128,6 +129,7 @@ function(builtin_register_target compiler_rt_path name)
128129
CMAKE_ARGS -DLLVM_LIBRARY_OUTPUT_INTDIR=${LLVM_LIBRARY_DIR}
129130
-DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_TOOLS_BINARY_DIR}
130131
-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
132+
-DLLVM_CMAKE_DIR=${CMAKE_BINARY_DIR}
131133
-DCMAKE_C_COMPILER_WORKS=ON
132134
-DCMAKE_ASM_COMPILER_WORKS=ON
133135
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON

0 commit comments

Comments
 (0)