Skip to content

Commit 6123e25

Browse files
committed
ci update freebsd version proposal, freebsd 12 being eol
1 parent b5c46dc commit 6123e25

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Diff for: src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV \
5555
CFLAGS_x86_64_fortanix_unknown_sgx="-D__ELF__ -isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
5656
CXX_x86_64_fortanix_unknown_sgx=clang++-11 \
5757
CXXFLAGS_x86_64_fortanix_unknown_sgx="-D__ELF__ -isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
58-
AR_i686_unknown_freebsd=i686-unknown-freebsd12-ar \
59-
CC_i686_unknown_freebsd=i686-unknown-freebsd12-clang \
60-
CXX_i686_unknown_freebsd=i686-unknown-freebsd12-clang++ \
58+
AR_i686_unknown_freebsd=i686-unknown-freebsd13-ar \
59+
CC_i686_unknown_freebsd=i686-unknown-freebsd13-clang \
60+
CXX_i686_unknown_freebsd=i686-unknown-freebsd13-clang++ \
6161
CC_aarch64_unknown_uefi=clang-11 \
6262
CXX_aarch64_unknown_uefi=clang++-11 \
6363
CC_i686_unknown_uefi=clang-11 \

Diff for: 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-freebsd12-ar \
33-
CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-clang \
34-
CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-clang++
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++
3535

3636
ENV HOSTS=x86_64-unknown-freebsd
3737

Diff for: 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=12.3
9-
triple=$arch-unknown-freebsd12
8+
freebsd_version=13.2
9+
triple=$arch-unknown-freebsd13
1010
sysroot=/usr/local/$triple
1111

1212
hide_output() {
@@ -68,7 +68,7 @@ curl "$URL" | tar xJf - -C "$sysroot" --wildcards "${files_to_extract[@]}"
6868
# there might be other problems.)
6969
#
7070
# The --target option is last because the cross-build of LLVM uses
71-
# --target without an OS version ("-freebsd" vs. "-freebsd12"). This
71+
# --target without an OS version ("-freebsd" vs. "-freebsd13"). This
7272
# makes Clang default to libstdc++ (which no longer exists), and also
7373
# controls other features, like GNU-style symbol table hashing and
7474
# anything predicated on the version number in the __FreeBSD__

0 commit comments

Comments
 (0)