Skip to content

Commit 53c1eb7

Browse files
committed
ci: demote i686-unknown-freebsd to tier 2 compiler target
While technically the i686-unknown-freebsd target has been a tier 2 development platform for a long time, with full toolchain tarballs available on static.rust-lang.org, due to a bug in the manifest generation the target was never available for download through rustup. The infrastructure team privately inquired the FreeBSD package maintainers, and they weren't relying on those tarballs either, so it's a fair assumption to say practically nobody is using those tarballs. This PR then removes the CI builder that produces full tarballs for the target, and moves the compilation of rust-std for the target in dist-various-2. The x86_64-unknown-freebsd target is *not* affected.
1 parent d662f80 commit 53c1eb7

File tree

5 files changed

+8
-41
lines changed

5 files changed

+8
-41
lines changed

.github/workflows/ci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,6 @@ jobs:
178178
- name: dist-i586-gnu-i586-i686-musl
179179
os: ubuntu-latest-xl
180180
env: {}
181-
- name: dist-i686-freebsd
182-
os: ubuntu-latest-xl
183-
env: {}
184181
- name: dist-i686-linux
185182
os: ubuntu-latest-xl
186183
env: {}

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

-34
This file was deleted.

src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+7
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ ENV \
4848
CFLAGS_x86_64_fortanix_unknown_sgx="-mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
4949
CXX_x86_64_fortanix_unknown_sgx=x86_64-fortanix-unknown-sgx-clang++-11 \
5050
CXXFLAGS_x86_64_fortanix_unknown_sgx="-mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
51+
AR_i686_unknown_freebsd=i686-unknown-freebsd11-ar \
52+
CC_i686_unknown_freebsd=i686-unknown-freebsd11-clang \
53+
CXX_i686_unknown_freebsd=i686-unknown-freebsd11-clang++ \
5154
CC=gcc-7 \
5255
CXX=g++-7
5356

@@ -74,6 +77,9 @@ RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh
7477
COPY host-x86_64/dist-various-2/build-wasi-toolchain.sh /tmp/
7578
RUN /tmp/build-wasi-toolchain.sh
7679

80+
COPY scripts/freebsd-toolchain.sh /tmp/
81+
RUN /tmp/freebsd-toolchain.sh i686
82+
7783
COPY scripts/sccache.sh /scripts/
7884
RUN sh /scripts/sccache.sh
7985

@@ -99,6 +105,7 @@ ENV TARGETS=$TARGETS,x86_64-fortanix-unknown-sgx
99105
ENV TARGETS=$TARGETS,nvptx64-nvidia-cuda
100106
ENV TARGETS=$TARGETS,armv7-unknown-linux-gnueabi
101107
ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabi
108+
ENV TARGETS=$TARGETS,i686-unknown-freebsd
102109

103110
# As per https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1300211
104111
# we need asm in the search path for gcc-7 (for gnux32) but not in the search path of the

src/ci/github-actions/ci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,6 @@ jobs:
325325
- name: dist-i586-gnu-i586-i686-musl
326326
<<: *job-linux-xl
327327

328-
- name: dist-i686-freebsd
329-
<<: *job-linux-xl
330-
331328
- name: dist-i686-linux
332329
<<: *job-linux-xl
333330

src/doc/rustc/src/platform-support.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ target | std | host | notes
8888
`i586-unknown-linux-gnu` | ✓ | | 32-bit Linux w/o SSE (kernel 4.4, glibc 2.23)
8989
`i586-unknown-linux-musl` | ✓ | | 32-bit Linux w/o SSE, MUSL
9090
`i686-linux-android` | ✓ | | 32-bit x86 Android
91-
`i686-unknown-freebsd` | ✓ | | 32-bit FreeBSD
91+
`i686-unknown-freebsd` | ✓ | | 32-bit FreeBSD
9292
`i686-unknown-linux-musl` | ✓ | | 32-bit Linux with MUSL
9393
`mips-unknown-linux-gnu` | ✓ | ✓ | MIPS Linux (kernel 4.4, glibc 2.23)
9494
`mips-unknown-linux-musl` | ✓ | | MIPS Linux with MUSL

0 commit comments

Comments
 (0)