Skip to content

Commit 951f757

Browse files
committed
ci: bump prebuilt LLVM on macOS and Windows to 10.0.0
1 parent aa7010d commit 951f757

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/ci/scripts/install-clang.sh

+11-6
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ IFS=$'\n\t'
88

99
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1010

11+
# Update both macOS's and Windows's tarballs when bumping the version here.
12+
LLVM_VERSION="10.0.0"
13+
1114
if isMacOS; then
12-
curl -f "${MIRRORS_BASE}/clang%2Bllvm-9.0.0-x86_64-darwin-apple.tar.xz" | tar xJf -
15+
curl -f "${MIRRORS_BASE}/clang%2Bllvm-${LLVM_VERSION}-x86_64-darwin-apple.tar.xz" | tar xJf -
1316

14-
ciCommandSetEnv CC "$(pwd)/clang+llvm-9.0.0-x86_64-darwin-apple/bin/clang"
15-
ciCommandSetEnv CXX "$(pwd)/clang+llvm-9.0.0-x86_64-darwin-apple/bin/clang++"
17+
ciCommandSetEnv CC "$(pwd)/clang+llvm-${LLVM_VERSION}-x86_64-darwin-apple/bin/clang"
18+
ciCommandSetEnv CXX "$(pwd)/clang+llvm-${LLVM_VERSION}-x86_64-darwin-apple/bin/clang++"
1619

1720
# macOS 10.15 onwards doesn't have libraries in /usr/include anymore: those
1821
# are now located deep into the filesystem, under Xcode's own files. The
@@ -33,8 +36,10 @@ elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
3336
#
3437
# Note that the LLVM installer is an NSIS installer
3538
#
36-
# Original downloaded here came from
37-
# http://releases.llvm.org/9.0.0/LLVM-9.0.0-win64.exe
39+
# Original downloaded here came from:
40+
#
41+
# https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe
42+
#
3843
# That installer was run through `wine ./installer.exe /S /NCRC` on Linux
3944
# and then the resulting installation directory (found in
4045
# `$HOME/.wine/drive_c/Program Files/LLVM`) was packaged up into a tarball.
@@ -45,7 +50,7 @@ elif isWindows && [[ ${CUSTOM_MINGW-0} -ne 1 ]]; then
4550

4651
mkdir -p citools
4752
cd citools
48-
curl -f "${MIRRORS_BASE}/LLVM-9.0.0-win64.tar.gz" | tar xzf -
53+
curl -f "${MIRRORS_BASE}/LLVM-${LLVM_VERSION}-win64.tar.gz" | tar xzf -
4954
ciCommandSetEnv RUST_CONFIGURE_ARGS \
5055
"${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$(pwd)/clang-rust/bin/clang-cl.exe"
5156
fi

0 commit comments

Comments
 (0)