diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-02-07 12:01:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-07 12:01:58 +0100 |
| commit | 8b69cf19835fccc8507d562cc102a07b140cd74f (patch) | |
| tree | 07b01b91d053df38b7dd40995269bd2266f62ffd /src/ci/docker/scripts | |
| parent | d84b4999194e3a24379dda2400d52db793d2f972 (diff) | |
| parent | d4b8c822593285c9c2f6a8d47a36514357b07d38 (diff) | |
| download | rust-8b69cf19835fccc8507d562cc102a07b140cd74f.tar.gz rust-8b69cf19835fccc8507d562cc102a07b140cd74f.zip | |
Rollup merge of #136582 - asomers:revert-132232, r=tgross35
Revert "CI: build FreeBSD artifacts on FreeBSD 13.4" This reverts commit cf34545720986d99712e3b542e8f395360c75095. That commit led to a regression of https://github.com/rust-lang/rust/issues/132185 . So my analysis that the problem lay in FreeBSD 13.2's specific LLVM version was clearly wrong. Revert that commit until we can figure out the real root cause. Fixes #132185 try-job: dist-x86_64-freebsd try-job: dist-various-2
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/freebsd-toolchain.sh | 6 |
1 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 b927658b4fd..0d02636db91 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.40 -freebsd_version=13.4 -triple=$arch-unknown-freebsd13 +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/2024-09-13-freebsd-${freebsd_version}-${freebsd_arch}-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 |