Skip to content

Commit 4e0695b

Browse files
authoredNov 9, 2020
Rollup merge of #78746 - pietroalbini:i686-freebsd, r=Mark-Simulacrum
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. cc `@rust-lang/infra` `@rust-lang/compiler` `@rust-lang/release` r? `@Mark-Simulacrum`
2 parents 8ebca24 + 53c1eb7 commit 4e0695b

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
@@ -183,9 +183,6 @@ jobs:
183183
- name: dist-i586-gnu-i586-i686-musl
184184
os: ubuntu-latest-xl
185185
env: {}
186-
- name: dist-i686-freebsd
187-
os: ubuntu-latest-xl
188-
env: {}
189186
- name: dist-i686-linux
190187
os: ubuntu-latest-xl
191188
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
@@ -328,9 +328,6 @@ jobs:
328328
- name: dist-i586-gnu-i586-i686-musl
329329
<<: *job-linux-xl
330330

331-
- name: dist-i686-freebsd
332-
<<: *job-linux-xl
333-
334331
- name: dist-i686-linux
335332
<<: *job-linux-xl
336333

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ target | std | host | notes
9494
`i586-unknown-linux-gnu` | ✓ | | 32-bit Linux w/o SSE (kernel 4.4, glibc 2.23)
9595
`i586-unknown-linux-musl` | ✓ | | 32-bit Linux w/o SSE, MUSL
9696
`i686-linux-android` | ✓ | | 32-bit x86 Android
97-
`i686-unknown-freebsd` | ✓ | | 32-bit FreeBSD
97+
`i686-unknown-freebsd` | ✓ | | 32-bit FreeBSD
9898
`i686-unknown-linux-musl` | ✓ | | 32-bit Linux with MUSL
9999
`mips-unknown-linux-gnu` | ✓ | ✓ | MIPS Linux (kernel 4.4, glibc 2.23)
100100
`mips-unknown-linux-musl` | ✓ | | MIPS Linux with MUSL

0 commit comments

Comments
 (0)