yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI/CD: Always use LLVM 12.

Browse Source
This commit is contained in:
Brian Smith 2021-04-29 15:44:24 -07:00
parent 4f30438640
commit e03cb68e53
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mk/cargo.sh
View File

@ -39,10 +39,7 @@ for arg in $*; do
done
# See comments in install-build-tools.sh.
llvm_version=10
if [ -n "${RING_COVERAGE-}" ]; then
llvm_version=11
fi
llvm_version=12
case $target in
aarch64-linux-android)

15
mk/install-build-tools.sh
View File

@ -82,14 +82,11 @@ case $target in
esac
if [ -n "$use_clang" ]; then
llvm_version=10
if [ -n "${RING_COVERAGE-}" ]; then
# https://github.com/rust-lang/rust/pull/79365 upgraded the coverage file
# format to one that only LLVM 11+ can use
llvm_version=11
sudo apt-key add mk/llvm-snapshot.gpg.key
sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$llvm_version main"
sudo apt-get update
fi
# https://github.com/rust-lang/rust/pull/79365 upgraded the coverage file
# format to one that only LLVM 11+ can use
llvm_version=12
sudo apt-key add mk/llvm-snapshot.gpg.key
sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$llvm_version main"
sudo apt-get update
install_packages clang-$llvm_version llvm-$llvm_version
fi