Skip to content

Commit b38c1d7

Browse files
Use env variable for LLVM_MAJOR_VERSION (#561)
After 9830980, the version the script was supposed to install (although probably did not due to apt.llvm.org shenanigans) and the symlinks did not match. Use a common environment variable to avoid needing to update all the numbers separately.
1 parent 9830980 commit b38c1d7

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

buildbot/buildbot_init.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,11 @@ ADMIN_PACKAGES="tmux"
8787
software-properties-common \
8888
gnupg
8989

90-
bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" 20
91-
ln -sf /usr/bin/clang-22 /usr/bin/cc
92-
ln -sf /usr/bin/clang++-22 /usr/bin/c++
93-
ln -sf /usr/bin/ld.lld-22 /usr/bin/ld
90+
export LLVM_MAJOR_VERSION=22
91+
bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ${LLVM_MAJOR_VERSION}
92+
ln -sf /usr/bin/clang-${LLVM_MAJOR_VERSION} /usr/bin/cc
93+
ln -sf /usr/bin/clang++-${LLVM_MAJOR_VERSION} /usr/bin/c++
94+
ln -sf /usr/bin/ld.lld-${LLVM_MAJOR_VERSION} /usr/bin/ld
9495

9596
) && exit 0
9697
done

0 commit comments

Comments
 (0)