diff options
| author | Bastian Germann <bage@linutronix.de> | 2019-05-28 19:30:46 +0200 |
|---|---|---|
| committer | Bastian Germann <bage@linutronix.de> | 2019-05-28 19:30:46 +0200 |
| commit | a552e7a85f65075b148a7d5cf039fbae5846fa1b (patch) | |
| tree | 6c5f72e2772a22078b35803df631f244be05f03a /src/ci/docker | |
| parent | 7da118581c9dc839c8bf3fbb622bab9ce32bbf38 (diff) | |
| download | rust-a552e7a85f65075b148a7d5cf039fbae5846fa1b.tar.gz rust-a552e7a85f65075b148a7d5cf039fbae5846fa1b.zip | |
Revert "Disable solaris target since toolchain no longer builds"
This reverts commit e764f475ca7fffd6167ea991afc7d1b2b3f642dc. Fixes #61174.
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/dist-various-2/Dockerfile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/ci/docker/dist-various-2/Dockerfile b/src/ci/docker/dist-various-2/Dockerfile index bf449c83f12..53523d41a55 100644 --- a/src/ci/docker/dist-various-2/Dockerfile +++ b/src/ci/docker/dist-various-2/Dockerfile @@ -32,10 +32,9 @@ COPY dist-various-2/build-cloudabi-toolchain.sh /tmp/ RUN /tmp/build-cloudabi-toolchain.sh x86_64-unknown-cloudabi COPY dist-various-2/build-fuchsia-toolchain.sh /tmp/ RUN /tmp/build-fuchsia-toolchain.sh -# FIXME(#61022) - reenable solaris -# COPY dist-various-2/build-solaris-toolchain.sh /tmp/ -# RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386 -# RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc +COPY dist-various-2/build-solaris-toolchain.sh /tmp/ +RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386 +RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc COPY dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/ # We pass the commit id of the port of LLVM's libunwind to the build script. # Any update to the commit id here, should cause the container image to be re-built from this point on. @@ -76,9 +75,8 @@ ENV TARGETS=x86_64-fuchsia ENV TARGETS=$TARGETS,aarch64-fuchsia ENV TARGETS=$TARGETS,wasm32-unknown-unknown ENV TARGETS=$TARGETS,wasm32-wasi -# FIXME(#61022) - reenable solaris -# ENV TARGETS=$TARGETS,sparcv9-sun-solaris -# ENV TARGETS=$TARGETS,x86_64-sun-solaris +ENV TARGETS=$TARGETS,sparcv9-sun-solaris +ENV TARGETS=$TARGETS,x86_64-sun-solaris ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnux32 ENV TARGETS=$TARGETS,x86_64-unknown-cloudabi ENV TARGETS=$TARGETS,x86_64-fortanix-unknown-sgx |