diff options
| author | bors <bors@rust-lang.org> | 2020-07-15 04:46:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-15 04:46:06 +0000 |
| commit | c714eae0e3b4ba263c193d54f6e46bb9a1feb2cc (patch) | |
| tree | 2feac2e01c2ee83d2b9cd9c2d3899551c207848d /src/ci/docker/host-x86_64 | |
| parent | 567ad7455d5f25f6b38d2fded1cb621e0c34a48b (diff) | |
| parent | 8368a35f834dc56519683ba3d98576ec3e905eb4 (diff) | |
| download | rust-c714eae0e3b4ba263c193d54f6e46bb9a1feb2cc.tar.gz rust-c714eae0e3b4ba263c193d54f6e46bb9a1feb2cc.zip | |
Auto merge of #71272 - jclulow:illumos-x86-ci, r=pietroalbini
build dist for x86_64-unknown-illumos This change creates a new Docker image, "dist-x86_64-illumos", and sets things up to build the full set of "dist" packages for illumos hosts, so that illumos users can use "rustup" to install packages. It also adjusts the manifest builder to expect complete toolchains for this platform.
Diffstat (limited to 'src/ci/docker/host-x86_64')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile new file mode 100644 index 00000000000..2a0f6a39c57 --- /dev/null +++ b/src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile @@ -0,0 +1,33 @@ +FROM ubuntu:18.04 + +# Enable source repositories, which are disabled by default on Ubuntu >= 18.04 +RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list + +COPY scripts/cross-apt-packages.sh /tmp/ +RUN bash /tmp/cross-apt-packages.sh + +# Required for cross-build gcc +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + libgmp-dev \ + libmpfr-dev \ + libmpc-dev + +COPY scripts/illumos-toolchain.sh /tmp/ + +RUN bash /tmp/illumos-toolchain.sh x86_64 sysroot +RUN bash /tmp/illumos-toolchain.sh x86_64 binutils +RUN bash /tmp/illumos-toolchain.sh x86_64 gcc + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +ENV \ + AR_x86_64_unknown_illumos=x86_64-illumos-ar \ + CC_x86_64_unknown_illumos=x86_64-illumos-gcc \ + CXX_x86_64_unknown_illumos=x86_64-illumos-g++ + +ENV HOSTS=x86_64-unknown-illumos + +ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs +ENV SCRIPT python3 ../x.py dist --host $HOSTS --target $HOSTS |