diff options
| author | bors <bors@rust-lang.org> | 2023-08-23 09:02:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-23 09:02:08 +0000 |
| commit | 3475fa74e118e2eaee8420a7898177f6387e17b4 (patch) | |
| tree | fd0fc5c86ca97d0cb1c6cf7e3498c4f44728ad9b /src/ci/docker/scripts | |
| parent | 810573919f24b2293ed806797ff8507577c809a9 (diff) | |
| parent | 5ee08a0c9393bf94dc7d2943fdd2c2cd2b616c82 (diff) | |
| download | rust-3475fa74e118e2eaee8420a7898177f6387e17b4.tar.gz rust-3475fa74e118e2eaee8420a7898177f6387e17b4.zip | |
Auto merge of #113986 - MaskRay:freebsd, r=nikic
ci: Update FreeBSD and illumos binutils to 2.40 The current old 2.25 seems to cause trouble to #106511. Install texinfo to dist-x86_64-freebsd/Dockerfile like other containers to fix ``` MAKEINFO doc/bfd.info /binutils/binutils-2.40/missing: 81: /binutils/binutils-2.40/missing: makeinfo: not found WARNING: 'makeinfo' is missing on your system. ``` --- https://www.freshports.org/devel/binutils uses 2.40 for FreeBSD 12.x as well. `@nikic`
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/freebsd-toolchain.sh | 2 | ||||
| -rw-r--r-- | src/ci/docker/scripts/illumos-toolchain.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/scripts/freebsd-toolchain.sh b/src/ci/docker/scripts/freebsd-toolchain.sh index 17cd456b995..0d02636db91 100755 --- a/src/ci/docker/scripts/freebsd-toolchain.sh +++ b/src/ci/docker/scripts/freebsd-toolchain.sh @@ -4,7 +4,7 @@ set -eux arch=$1 -binutils_version=2.25.1 +binutils_version=2.40 freebsd_version=12.3 triple=$arch-unknown-freebsd12 sysroot=/usr/local/$triple diff --git a/src/ci/docker/scripts/illumos-toolchain.sh b/src/ci/docker/scripts/illumos-toolchain.sh index 3f1d5f3426a..0b2c09b3eed 100644 --- a/src/ci/docker/scripts/illumos-toolchain.sh +++ b/src/ci/docker/scripts/illumos-toolchain.sh @@ -52,8 +52,8 @@ SYSROOT_URL='https://github.com/illumos/sysroot/releases/download/' SYSROOT_URL+="$SYSROOT_VER/$SYSROOT_TAR" SYSROOT_DIR="$PREFIX/sysroot" -BINUTILS_VERSION='2.25.1' -BINUTILS_SUM='b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22' +BINUTILS_VERSION='2.40' +BINUTILS_SUM='f8298eb153a4b37d112e945aa5cb2850040bcf26a3ea65b5a715c83afe05e48a' BINUTILS_BASE="binutils-$BINUTILS_VERSION" BINUTILS_TAR="$BINUTILS_BASE.tar.bz2" BINUTILS_URL="https://ftp.gnu.org/gnu/binutils/$BINUTILS_TAR" |