Skip to content

Commit 3475fa7

Browse files
committed
Auto merge of rust-lang#113986 - MaskRay:freebsd, r=nikic
ci: Update FreeBSD and illumos binutils to 2.40 The current old 2.25 seems to cause trouble to rust-lang#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`
2 parents 8105739 + 5ee08a0 commit 3475fa7

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
sudo \
1414
bzip2 \
1515
xz-utils \
16+
texinfo \
1617
wget \
1718
libssl-dev \
1819
pkg-config \

src/ci/docker/scripts/freebsd-toolchain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
set -eux
55

66
arch=$1
7-
binutils_version=2.25.1
7+
binutils_version=2.40
88
freebsd_version=12.3
99
triple=$arch-unknown-freebsd12
1010
sysroot=/usr/local/$triple

src/ci/docker/scripts/illumos-toolchain.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ SYSROOT_URL='https://github.com/illumos/sysroot/releases/download/'
5252
SYSROOT_URL+="$SYSROOT_VER/$SYSROOT_TAR"
5353
SYSROOT_DIR="$PREFIX/sysroot"
5454

55-
BINUTILS_VERSION='2.25.1'
56-
BINUTILS_SUM='b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22'
55+
BINUTILS_VERSION='2.40'
56+
BINUTILS_SUM='f8298eb153a4b37d112e945aa5cb2850040bcf26a3ea65b5a715c83afe05e48a'
5757
BINUTILS_BASE="binutils-$BINUTILS_VERSION"
5858
BINUTILS_TAR="$BINUTILS_BASE.tar.bz2"
5959
BINUTILS_URL="https://ftp.gnu.org/gnu/binutils/$BINUTILS_TAR"

0 commit comments

Comments
 (0)