mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-19 18:34:08 +00:00
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`
This commit is contained in:
commit
3475fa74e1
@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
sudo \
|
||||
bzip2 \
|
||||
xz-utils \
|
||||
texinfo \
|
||||
wget \
|
||||
libssl-dev \
|
||||
pkg-config \
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user