Skip to content

Commit 60ba6b4

Browse files
authored
Rollup merge of rust-lang#116216 - heiher:crosstool, r=Kobzol
ci: upgrade to crosstool-ng 1.26.0 This PR upgrades our builders from crosstool-ng 1.25.0 to 1.26.0. Except for LoongArch64 and RISC-V 64, which have minor version upgrades, other architectures have not changed.
2 parents 77e9dcd + f99fdac commit 60ba6b4

File tree

4 files changed

+5
-23
lines changed

4 files changed

+5
-23
lines changed

src/ci/docker/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ For targets: `loongarch64-unknown-linux-gnu`
271271
- Operating System > Linux kernel version = 5.19.16
272272
- Binary utilities > Version of binutils = 2.40
273273
- C-library > glibc version = 2.36
274-
- C compiler > gcc version = 13.1.0
274+
- C compiler > gcc version = 13.2.0
275275
- C compiler > C++ = ENABLE -- to cross compile LLVM
276276
277277
### `mips-linux-gnu.defconfig`
@@ -407,7 +407,7 @@ For targets: `riscv64-unknown-linux-gnu`
407407
- Target options > Bitness = 64-bit
408408
- Operating System > Target OS = linux
409409
- Operating System > Linux kernel version = 4.20.17
410-
- Binary utilities > Version of binutils = 2.32
410+
- Binary utilities > Version of binutils = 2.36.1
411411
- C-library > glibc version = 2.29
412412
- C compiler > gcc version = 8.5.0
413413
- C compiler > C++ = ENABLE -- to cross compile LLVM

src/ci/docker/host-x86_64/dist-loongarch64-linux/Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ FROM ubuntu:22.04
33
COPY scripts/cross-apt-packages.sh /scripts/
44
RUN sh /scripts/cross-apt-packages.sh
55

6-
# The latest released version does not support LoongArch.
7-
COPY scripts/crosstool-ng-git.sh /scripts/
8-
RUN sh /scripts/crosstool-ng-git.sh
6+
COPY scripts/crosstool-ng.sh /scripts/
7+
RUN sh /scripts/crosstool-ng.sh
98

109
COPY scripts/rustbuild-setup.sh /scripts/
1110
RUN sh /scripts/rustbuild-setup.sh

src/ci/docker/scripts/crosstool-ng-git.sh

-17
This file was deleted.

src/ci/docker/scripts/crosstool-ng.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -ex
33

4-
CT_NG=1.25.0
4+
CT_NG=1.26.0
55

66
url="https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-$CT_NG.tar.gz"
77
curl -Lf $url | tar xzf -

0 commit comments

Comments
 (0)