File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 5252 CFLAGS_x86_64_fortanix_unknown_sgx="-D__ELF__ -isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
5353 CXX_x86_64_fortanix_unknown_sgx=clang++-11 \
5454 CXXFLAGS_x86_64_fortanix_unknown_sgx="-D__ELF__ -isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
55- AR_i686_unknown_freebsd=i686-unknown-freebsd11 -ar \
56- CC_i686_unknown_freebsd=i686-unknown-freebsd11 -clang \
57- CXX_i686_unknown_freebsd=i686-unknown-freebsd11 -clang++ \
55+ AR_i686_unknown_freebsd=i686-unknown-freebsd12 -ar \
56+ CC_i686_unknown_freebsd=i686-unknown-freebsd12 -clang \
57+ CXX_i686_unknown_freebsd=i686-unknown-freebsd12 -clang++ \
5858 CC=gcc-8 \
5959 CXX=g++-8
6060
Original file line number Diff line number Diff line change @@ -27,9 +27,9 @@ COPY scripts/cmake.sh /scripts/
2727RUN /scripts/cmake.sh
2828
2929ENV \
30- AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd11 -ar \
31- CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd11 -clang \
32- CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd11 -clang++
30+ AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd12 -ar \
31+ CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd12 -clang \
32+ CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd12 -clang++
3333
3434ENV HOSTS=x86_64-unknown-freebsd
3535
Original file line number Diff line number Diff line change 55
66arch=$1
77binutils_version=2.25.1
8- freebsd_version=11.4
9- triple=$arch -unknown-freebsd11
8+ freebsd_version=12.3
9+ triple=$arch -unknown-freebsd12
1010sysroot=/usr/local/$triple
1111
1212hide_output () {
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/2020-08-09 -freebsd-${freebsd_arch } -${freebsd_version} -RELEASE -base.txz
62+ URL=https://ci-mirrors.rust-lang.org/rustc/2022-05-06 -freebsd-${freebsd_version } -${freebsd_arch} -base.txz
6363curl " $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
@@ -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. "-freebsd11 "). This
71+ # --target without an OS version ("-freebsd" vs. "-freebsd12 "). 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__
You can’t perform that action at this time.
0 commit comments