diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2022-04-27 09:53:38 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2022-04-28 16:04:15 +0200 |
| commit | 278fdf6c828f18d2db1b3b5d026214ce2d7dadb3 (patch) | |
| tree | 16d4d0a074640099751843b82176a6e4ea282159 /src/ci/docker | |
| parent | 3bfeffd55bbc7d653d2df7ad265746bafe595a96 (diff) | |
| download | rust-278fdf6c828f18d2db1b3b5d026214ce2d7dadb3.tar.gz rust-278fdf6c828f18d2db1b3b5d026214ce2d7dadb3.zip | |
Update LLVM used for building rustc in CI for x64 to LLVM 14.0.2
Diffstat (limited to 'src/ci/docker')
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh | 7 | ||||
| -rwxr-xr-x | src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh index 562be752f84..495c539d069 100755 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh @@ -4,7 +4,7 @@ set -ex source shared.sh -LLVM=llvmorg-13.0.0 +LLVM=llvmorg-14.0.2 mkdir llvm-project cd llvm-project @@ -30,7 +30,12 @@ hide_output \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/rustroot \ -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ + -DCOMPILER_RT_BUILD_XRAY=OFF \ + -DCOMPILER_RT_BUILD_MEMPROF=OFF \ -DLLVM_TARGETS_TO_BUILD=X86 \ + -DLLVM_INCLUDE_BENCHMARKS=OFF \ + -DLLVM_INCLUDE_TESTS=OFF \ + -DLLVM_INCLUDE_EXAMPLES=OFF \ -DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt" \ -DC_INCLUDE_DIRS="$INC" diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh index 3a03eb2bdc8..7992ec3b991 100755 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh @@ -3,7 +3,7 @@ set -ex source shared.sh -GCC=5.5.0 +GCC=7.5.0 curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.xz | xzcat | tar xf - cd gcc-$GCC |