Skip to content

Commit a5d6734

Browse files
fix: add LLVM_TOOLS_BINARY_DIR to CMake configuration for tool discovery
Signed-off-by: Federico Bruzzone <federico.bruzzone.i@gmail.com> Assisted-by: GitHub-Copilot:auto
1 parent 0c71df6 commit a5d6734

4 files changed

Lines changed: 5 additions & 0 deletions

File tree

.github/workflows/arch-x86.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
run: |
4545
mkdir build && cd build
4646
cmake -DCMAKE_PREFIX_PATH="${LLVM_PREFIX}" \
47+
-DLLVM_TOOLS_BINARY_DIR="${LLVM_PREFIX}/bin" \
4748
-DCMAKE_BUILD_TYPE=${{ matrix.type }} \
4849
-G Ninja ../
4950
ninja -j2

.github/workflows/fedora-x86.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
run: |
4545
mkdir build && cd build
4646
cmake -DCMAKE_PREFIX_PATH="${LLVM_PREFIX}" \
47+
-DLLVM_TOOLS_BINARY_DIR="${LLVM_PREFIX}/bin" \
4748
-DCMAKE_BUILD_TYPE=${{ matrix.type }} \
4849
-G Ninja ../
4950
ninja -j2

.github/workflows/opensuse-x86.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
run: |
4646
mkdir build && cd build
4747
cmake -DCMAKE_PREFIX_PATH="${LLVM_PREFIX}" \
48+
-DLLVM_TOOLS_BINARY_DIR="${LLVM_PREFIX}/bin" \
4849
-DCMAKE_BUILD_TYPE=${{ matrix.type }} \
4950
-G Ninja ../
5051
ninja -j2

test/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ endif()
1616
find_program(ETER_LIT_EXECUTABLE
1717
NAMES llvm-lit lit
1818
HINTS "${LLVM_TOOLS_BINARY_DIR}" "${LLVM_TOOL_BIN_DIR}"
19+
PATHS "${LLVM_TOOL_BIN_DIR}"
1920
DOC "Path to the lit test runner"
2021
)
2122

2223
find_program(FILECHECK_EXECUTABLE
2324
NAMES FileCheck filecheck
2425
HINTS "${LLVM_TOOLS_BINARY_DIR}" "${LLVM_TOOL_BIN_DIR}"
26+
PATHS "${LLVM_TOOL_BIN_DIR}"
2527
DOC "Path to the FileCheck utility"
2628
)
2729

0 commit comments

Comments
 (0)