Skip to content

Commit f3ea2d9

Browse files
committed
Adjust search orders so we look for clang with a suffix first
1 parent 5a940d9 commit f3ea2d9

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

standalone-contract/scripts/find_clang

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ if [[ -n "${CLANG}" ]]; then
77
exit 0
88
fi
99

10-
CANDIDATES=("clang" "clang-16" "clang-17" "clang-18")
10+
CANDIDATES=("clang-19" "clang-18" "clang-17" "clang-16" "clang")
1111

1212
BREW_PREFIX=$(brew --prefix 2> /dev/null)
1313
if [[ -n "${BREW_PREFIX}" ]]; then
1414
CANDIDATES+=(
15-
"${BREW_PREFIX}/opt/llvm/bin/clang"
16-
"${BREW_PREFIX}/opt/llvm@16/bin/clang"
17-
"${BREW_PREFIX}/opt/llvm@17/bin/clang"
15+
"${BREW_PREFIX}/opt/llvm@19/bin/clang"
1816
"${BREW_PREFIX}/opt/llvm@18/bin/clang"
17+
"${BREW_PREFIX}/opt/llvm@17/bin/clang"
18+
"${BREW_PREFIX}/opt/llvm@16/bin/clang"
19+
"${BREW_PREFIX}/opt/llvm/bin/clang"
1920
)
2021
fi
2122

workspace/scripts/find_clang

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ if [[ -n "${CLANG}" ]]; then
77
exit 0
88
fi
99

10-
CANDIDATES=("clang" "clang-16" "clang-17" "clang-18")
10+
CANDIDATES=("clang-19" "clang-18" "clang-17" "clang-16" "clang")
1111

1212
BREW_PREFIX=$(brew --prefix 2> /dev/null)
1313
if [[ -n "${BREW_PREFIX}" ]]; then
1414
CANDIDATES+=(
15-
"${BREW_PREFIX}/opt/llvm/bin/clang"
16-
"${BREW_PREFIX}/opt/llvm@16/bin/clang"
17-
"${BREW_PREFIX}/opt/llvm@17/bin/clang"
15+
"${BREW_PREFIX}/opt/llvm@19/bin/clang"
1816
"${BREW_PREFIX}/opt/llvm@18/bin/clang"
17+
"${BREW_PREFIX}/opt/llvm@17/bin/clang"
18+
"${BREW_PREFIX}/opt/llvm@16/bin/clang"
19+
"${BREW_PREFIX}/opt/llvm/bin/clang"
1920
)
2021
fi
2122

0 commit comments

Comments
 (0)