Skip to content

Commit 116d4f7

Browse files
committed
Auto merge of #136582 - asomers:revert-132232, r=<try>
Revert "CI: build FreeBSD artifacts on FreeBSD 13.4" This reverts commit cf34545. That commit led to a regression of #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
2 parents 820bfff + 8d8028f commit 116d4f7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ COPY scripts/cmake.sh /scripts/
2929
RUN /scripts/cmake.sh
3030

3131
ENV \
32-
AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd13-ar \
33-
CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd13-clang \
34-
CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd13-clang++
32+
AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-ar \
33+
CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-clang \
34+
CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-clang++
3535

3636
ENV HOSTS=x86_64-unknown-freebsd
3737

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set -eux
55

66
arch=$1
77
binutils_version=2.40
8-
freebsd_version=13.4
9-
triple=$arch-unknown-freebsd13
8+
freebsd_version=12.3
9+
triple=$arch-unknown-freebsd12
1010
sysroot=/usr/local/$triple
1111

1212
hide_output() {
@@ -59,7 +59,7 @@ done
5959

6060
# Originally downloaded from:
6161
# URL=https://download.freebsd.org/ftp/releases/${freebsd_arch}/${freebsd_version}-RELEASE/base.txz
62-
URL=https://ci-mirrors.rust-lang.org/rustc/2024-09-13-freebsd-${freebsd_version}-${freebsd_arch}-base.txz
62+
URL=https://ci-mirrors.rust-lang.org/rustc/2022-05-06-freebsd-${freebsd_version}-${freebsd_arch}-base.txz
6363
curl "$URL" | tar xJf - -C "$sysroot" --wildcards "${files_to_extract[@]}"
6464

6565
# Clang can do cross-builds out of the box, if we give it the right

0 commit comments

Comments
 (0)