mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #116216 - heiher:crosstool, r=Kobzol

Browse Source 
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.
This commit is contained in:
Matthias Krüger 2023-09-29 22:27:51 +02:00 committed by GitHub
commit 60ba6b494a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ci/docker/README.md
View File

@ -271,7 +271,7 @@ For targets: `loongarch64-unknown-linux-gnu`
- Operating System > Linux kernel version = 5.19.16 - Operating System > Linux kernel version = 5.19.16
- Binary utilities > Version of binutils = 2.40 - Binary utilities > Version of binutils = 2.40
- C-library > glibc version = 2.36 - C-library > glibc version = 2.36
- C compiler > gcc version = 13.1.0 - C compiler > gcc version = 13.2.0
- C compiler > C++ = ENABLE -- to cross compile LLVM - C compiler > C++ = ENABLE -- to cross compile LLVM
### `mips-linux-gnu.defconfig` ### `mips-linux-gnu.defconfig`
@ -407,7 +407,7 @@ For targets: `riscv64-unknown-linux-gnu`
- Target options > Bitness = 64-bit - Target options > Bitness = 64-bit
- Operating System > Target OS = linux - Operating System > Target OS = linux
- Operating System > Linux kernel version = 4.20.17 - Operating System > Linux kernel version = 4.20.17
- Binary utilities > Version of binutils = 2.32 - Binary utilities > Version of binutils = 2.36.1
- C-library > glibc version = 2.29 - C-library > glibc version = 2.29
- C compiler > gcc version = 8.5.0 - C compiler > gcc version = 8.5.0
- C compiler > C++ = ENABLE -- to cross compile LLVM - C compiler > C++ = ENABLE -- to cross compile LLVM

5
src/ci/docker/host-x86_64/dist-loongarch64-linux/Dockerfile
View File

@ -3,9 +3,8 @@ FROM ubuntu:22.04
COPY scripts/cross-apt-packages.sh /scripts/ COPY scripts/cross-apt-packages.sh /scripts/
RUN sh /scripts/cross-apt-packages.sh RUN sh /scripts/cross-apt-packages.sh
# The latest released version does not support LoongArch. COPY scripts/crosstool-ng.sh /scripts/
COPY scripts/crosstool-ng-git.sh /scripts/ RUN sh /scripts/crosstool-ng.sh
RUN sh /scripts/crosstool-ng-git.sh
COPY scripts/rustbuild-setup.sh /scripts/ COPY scripts/rustbuild-setup.sh /scripts/
RUN sh /scripts/rustbuild-setup.sh RUN sh /scripts/rustbuild-setup.sh

17
src/ci/docker/scripts/crosstool-ng-git.sh
View File

@ -1,17 +0,0 @@
#!/bin/sh
set -ex
URL=https://github.com/crosstool-ng/crosstool-ng
REV=227d99d7f3115f3a078595a580d2b307dcd23e93
mkdir crosstool-ng
cd crosstool-ng
git init
git fetch --depth=1 ${URL} ${REV}
git reset --hard FETCH_HEAD
./bootstrap
./configure --prefix=/usr/local
make -j$(nproc)
make install
cd ..
rm -rf crosstool-ng

2
src/ci/docker/scripts/crosstool-ng.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
set -ex set -ex
CT_NG=1.25.0 CT_NG=1.26.0
url="https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-$CT_NG.tar.gz" url="https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-$CT_NG.tar.gz"
curl -Lf $url | tar xzf - curl -Lf $url | tar xzf -