Skip to content

Commit 1388b38

Browse files
committed
Auto merge of rust-lang#95171 - Kobzol:llvm-ci-update, r=nikic
Update LLVM used for building rustc in CI for x64 LLVM 14 was tagged. It is needed for building [BOLT](rust-lang#94381), and it also improves max RSS quite [a lot](https://perf.rust-lang.org/compare.html?start=6970f88db3ac2a9cefa9c585228291ae1f18fb04&end=67acb7e3ffcc11d67abfd29c390aac629f3c0e97&stat=max-rss). GCC was bumped to allow building the new LLVM version. The changes in building LLVM were done to speed up the build a bit by ignoring unused parts and to turn off parts that were problematic to compile even with the bumped GCC.
2 parents b2c2a32 + 4472d4c commit 1388b38

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
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

src/llvm-project

Submodule llvm-project updated 60 files

0 commit comments

Comments
 (0)