diff options
| author | bors <bors@rust-lang.org> | 2022-06-19 03:30:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-19 03:30:05 +0000 |
| commit | 6c9be6e4e9074ca58cef8b1ded299eff72e3ac52 (patch) | |
| tree | da460993e96b74329c1d1ba8ae15eea3ed342d22 /src/ci/docker/scripts | |
| parent | 3b98c08288528c243973a54934e4be75bcf20c31 (diff) | |
| parent | 13b4000fd31e33e969776896b7e4e19efda576ed (diff) | |
| download | rust-6c9be6e4e9074ca58cef8b1ded299eff72e3ac52.tar.gz rust-6c9be6e4e9074ca58cef8b1ded299eff72e3ac52.zip | |
Auto merge of #97944 - nikic:freebsd-update, r=Mark-Simulacrum
Update FreeBSD toolchain to 12.3 Update the FreeBSD toolchain to 12.3. FreeBSD 11 is EOL since September 30, 2021. I've locally verified that the `dist-x86_64-freebsd` docker image builds successfully. r? `@Mark-Simulacrum`
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/freebsd-toolchain.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ci/docker/scripts/freebsd-toolchain.sh b/src/ci/docker/scripts/freebsd-toolchain.sh index 2f7c57bcdc4..4a4cac1b723 100755 --- a/src/ci/docker/scripts/freebsd-toolchain.sh +++ b/src/ci/docker/scripts/freebsd-toolchain.sh @@ -5,8 +5,8 @@ set -eux arch=$1 binutils_version=2.25.1 -freebsd_version=11.4 -triple=$arch-unknown-freebsd11 +freebsd_version=12.3 +triple=$arch-unknown-freebsd12 sysroot=/usr/local/$triple hide_output() { @@ -59,7 +59,7 @@ done # Originally downloaded from: # URL=https://download.freebsd.org/ftp/releases/${freebsd_arch}/${freebsd_version}-RELEASE/base.txz -URL=https://ci-mirrors.rust-lang.org/rustc/2020-08-09-freebsd-${freebsd_arch}-${freebsd_version}-RELEASE-base.txz +URL=https://ci-mirrors.rust-lang.org/rustc/2022-05-06-freebsd-${freebsd_version}-${freebsd_arch}-base.txz curl "$URL" | tar xJf - -C "$sysroot" --wildcards "${files_to_extract[@]}" # Clang can do cross-builds out of the box, if we give it the right @@ -68,7 +68,7 @@ curl "$URL" | tar xJf - -C "$sysroot" --wildcards "${files_to_extract[@]}" # there might be other problems.) # # The --target option is last because the cross-build of LLVM uses -# --target without an OS version ("-freebsd" vs. "-freebsd11"). This +# --target without an OS version ("-freebsd" vs. "-freebsd12"). This # makes Clang default to libstdc++ (which no longer exists), and also # controls other features, like GNU-style symbol table hashing and # anything predicated on the version number in the __FreeBSD__ |