mirror of
https://github.com/rust-lang/rust
synced 2024-09-05 16:57:03 +00:00
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.
This commit is contained in:
parent
d662f80855
commit
53c1eb7a26
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
|
@ -178,9 +178,6 @@ jobs:
|
|||
- name: dist-i586-gnu-i586-i686-musl
|
||||
os: ubuntu-latest-xl
|
||||
env: {}
|
||||
- name: dist-i686-freebsd
|
||||
os: ubuntu-latest-xl
|
||||
env: {}
|
||||
- name: dist-i686-linux
|
||||
os: ubuntu-latest-xl
|
||||
env: {}
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
FROM ubuntu:18.04
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
clang \
|
||||
make \
|
||||
ninja-build \
|
||||
file \
|
||||
curl \
|
||||
ca-certificates \
|
||||
python3 \
|
||||
git \
|
||||
cmake \
|
||||
sudo \
|
||||
bzip2 \
|
||||
xz-utils \
|
||||
wget \
|
||||
libssl-dev \
|
||||
pkg-config
|
||||
|
||||
COPY scripts/freebsd-toolchain.sh /tmp/
|
||||
RUN /tmp/freebsd-toolchain.sh i686
|
||||
|
||||
COPY scripts/sccache.sh /scripts/
|
||||
RUN sh /scripts/sccache.sh
|
||||
|
||||
ENV \
|
||||
AR_i686_unknown_freebsd=i686-unknown-freebsd11-ar \
|
||||
CC_i686_unknown_freebsd=i686-unknown-freebsd11-clang \
|
||||
CXX_i686_unknown_freebsd=i686-unknown-freebsd11-clang++
|
||||
|
||||
ENV HOSTS=i686-unknown-freebsd
|
||||
|
||||
ENV RUST_CONFIGURE_ARGS --enable-extended --enable-profiler --disable-docs
|
||||
ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS
|
|
@ -48,6 +48,9 @@ ENV \
|
|||
CFLAGS_x86_64_fortanix_unknown_sgx="-mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
|
||||
CXX_x86_64_fortanix_unknown_sgx=x86_64-fortanix-unknown-sgx-clang++-11 \
|
||||
CXXFLAGS_x86_64_fortanix_unknown_sgx="-mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
|
||||
AR_i686_unknown_freebsd=i686-unknown-freebsd11-ar \
|
||||
CC_i686_unknown_freebsd=i686-unknown-freebsd11-clang \
|
||||
CXX_i686_unknown_freebsd=i686-unknown-freebsd11-clang++ \
|
||||
CC=gcc-7 \
|
||||
CXX=g++-7
|
||||
|
||||
|
@ -74,6 +77,9 @@ RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh
|
|||
COPY host-x86_64/dist-various-2/build-wasi-toolchain.sh /tmp/
|
||||
RUN /tmp/build-wasi-toolchain.sh
|
||||
|
||||
COPY scripts/freebsd-toolchain.sh /tmp/
|
||||
RUN /tmp/freebsd-toolchain.sh i686
|
||||
|
||||
COPY scripts/sccache.sh /scripts/
|
||||
RUN sh /scripts/sccache.sh
|
||||
|
||||
|
@ -99,6 +105,7 @@ ENV TARGETS=$TARGETS,x86_64-fortanix-unknown-sgx
|
|||
ENV TARGETS=$TARGETS,nvptx64-nvidia-cuda
|
||||
ENV TARGETS=$TARGETS,armv7-unknown-linux-gnueabi
|
||||
ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabi
|
||||
ENV TARGETS=$TARGETS,i686-unknown-freebsd
|
||||
|
||||
# As per https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1300211
|
||||
# we need asm in the search path for gcc-7 (for gnux32) but not in the search path of the
|
||||
|
|
|
@ -325,9 +325,6 @@ jobs:
|
|||
- name: dist-i586-gnu-i586-i686-musl
|
||||
<<: *job-linux-xl
|
||||
|
||||
- name: dist-i686-freebsd
|
||||
<<: *job-linux-xl
|
||||
|
||||
- name: dist-i686-linux
|
||||
<<: *job-linux-xl
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ target | std | host | notes
|
|||
`i586-unknown-linux-gnu` | ✓ | | 32-bit Linux w/o SSE (kernel 4.4, glibc 2.23)
|
||||
`i586-unknown-linux-musl` | ✓ | | 32-bit Linux w/o SSE, MUSL
|
||||
`i686-linux-android` | ✓ | | 32-bit x86 Android
|
||||
`i686-unknown-freebsd` | ✓ | ✓ | 32-bit FreeBSD
|
||||
`i686-unknown-freebsd` | ✓ | | 32-bit FreeBSD
|
||||
`i686-unknown-linux-musl` | ✓ | | 32-bit Linux with MUSL
|
||||
`mips-unknown-linux-gnu` | ✓ | ✓ | MIPS Linux (kernel 4.4, glibc 2.23)
|
||||
`mips-unknown-linux-musl` | ✓ | | MIPS Linux with MUSL
|
||||
|
|
Loading…
Reference in a new issue