Skip to content

Commit

Permalink
Rollup merge of rust-lang#74871 - etherealist:musl_doc, r=Mark-Simula…
Browse files Browse the repository at this point in the history
…crum

Enable docs on dist-x86_64-musl

Add the `rust-docs` component to toolchain `x86_64-unknown-linux-musl`, which allows people using rustup on their musl-based linux distribution to download the rust-docs.

`--disable-docs` is based on the assumption that `x86_64-unknown-linux-musl` is only a cross-compile target.

I have tested that the docs are built. I assume the build-system will automatically detect the docs and create a `rust-docs` component. I will [monitor](https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-musl.html) the components and create a follow-up PR, if the docs aren't published.

See also rust-lang#70619, where we enabled `rust-lld` to enable the wasm-workflow on musl-based linux distributions.
  • Loading branch information
Manishearth authored Jul 30, 2020
2 parents 172b3a7 + b5d143b commit 8892785
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ ENV HOSTS=x86_64-unknown-linux-musl
ENV RUST_CONFIGURE_ARGS \
--musl-root-x86_64=/usr/local/x86_64-linux-musl \
--enable-extended \
--disable-docs \
--enable-lld \
--set target.x86_64-unknown-linux-musl.crt-static=false \
--build $HOSTS
Expand Down

0 comments on commit 8892785

Please sign in to comment.