@@ -8,11 +8,14 @@ IFS=$'\n\t'
8
8
9
9
source " $( cd " $( dirname " $0 " ) " && pwd) /../shared.sh"
10
10
11
+ # Update both macOS's and Windows's tarballs when bumping the version here.
12
+ LLVM_VERSION=" 10.0.0"
13
+
11
14
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 -
13
16
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++"
16
19
17
20
# macOS 10.15 onwards doesn't have libraries in /usr/include anymore: those
18
21
# 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
33
36
#
34
37
# Note that the LLVM installer is an NSIS installer
35
38
#
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
+ #
38
43
# That installer was run through `wine ./installer.exe /S /NCRC` on Linux
39
44
# and then the resulting installation directory (found in
40
45
# `$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
45
50
46
51
mkdir -p citools
47
52
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 -
49
54
ciCommandSetEnv RUST_CONFIGURE_ARGS \
50
55
" ${RUST_CONFIGURE_ARGS} --set llvm.clang-cl=$( pwd) /clang-rust/bin/clang-cl.exe"
51
56
fi
0 commit comments