diff options
| author | bors <bors@rust-lang.org> | 2025-02-07 13:42:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-07 13:42:52 +0000 |
| commit | 64e06c0f5578829373743884b708d494136c3e8f (patch) | |
| tree | 43287d63ad59b14feb122ec27bed172c4c889653 /src/ci/docker/scripts | |
| parent | 5ff18d0eaefd1bd9ab8ec33dab2404a44e7631ed (diff) | |
| parent | 0047263387c046f1caf71c0c652612e9bb42b8a7 (diff) | |
| download | rust-64e06c0f5578829373743884b708d494136c3e8f.tar.gz rust-64e06c0f5578829373743884b708d494136c3e8f.zip | |
Auto merge of #136684 - matthiaskrgr:rollup-mlpzre5, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- #135973 (fix tail call checks wrt `#[track_caller]`)
- #136191 (compiler: replace few consts arrays with statics to remove const dupes)
- #136565 (compiler: Clean up weird `rustc_abi` reexports)
- #136582 (Revert "CI: build FreeBSD artifacts on FreeBSD 13.4")
- #136627 (MIR validation: add comment explaining the limitations of CfgChecker)
- #136634 (Stabilise `Cursor::{get_mut, set_position}` in `const` scenarios.)
- #136643 (ping me for attribute-related changes)
- #136644 (Add `rustc_hir_pretty::item_to_string` function)
r? `@ghost`
`@rustbot` modify labels: rollup
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 |