Skip to content

Commit 278fdf6

Browse files
committed
Update LLVM used for building rustc in CI for x64 to LLVM 14.0.2
1 parent 3bfeffd commit 278fdf6

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -ex
44

55
source shared.sh
66

7-
LLVM=llvmorg-13.0.0
7+
LLVM=llvmorg-14.0.2
88

99
mkdir llvm-project
1010
cd llvm-project
@@ -30,7 +30,12 @@ hide_output \
3030
-DCMAKE_BUILD_TYPE=Release \
3131
-DCMAKE_INSTALL_PREFIX=/rustroot \
3232
-DCOMPILER_RT_BUILD_SANITIZERS=OFF \
33+
-DCOMPILER_RT_BUILD_XRAY=OFF \
34+
-DCOMPILER_RT_BUILD_MEMPROF=OFF \
3335
-DLLVM_TARGETS_TO_BUILD=X86 \
36+
-DLLVM_INCLUDE_BENCHMARKS=OFF \
37+
-DLLVM_INCLUDE_TESTS=OFF \
38+
-DLLVM_INCLUDE_EXAMPLES=OFF \
3439
-DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt" \
3540
-DC_INCLUDE_DIRS="$INC"
3641

src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -ex
33

44
source shared.sh
55

6-
GCC=5.5.0
6+
GCC=7.5.0
77

88
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.xz | xzcat | tar xf -
99
cd gcc-$GCC

0 commit comments

Comments
 (0)