Skip to content

Commit

Permalink
Auto merge of #45366 - ollie27:rustbuild_compiler_docs, r=alexcrichton
Browse files Browse the repository at this point in the history
rustbuild: Don't try to build rustdoc API docs with compiler docs

rustdoc is built separately to rustc now so the docs would need to be
generated separately as well. Also rustdoc doesn't build at stage 1
which prevented the compiler docs being built at stage 1.

Fixes: #44629
  • Loading branch information
bors committed Oct 21, 2017
2 parents 7e70546 + 1652c58 commit ff8773d
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/bootstrap/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -623,11 +623,9 @@ impl Step for Rustc {
compile::rustc_cargo(build, &compiler, target, &mut cargo);

if build.config.compiler_docs {
// src/rustc/Cargo.toml contains bin crates called rustc and rustdoc
// which would otherwise overwrite the docs for the real rustc and
// rustdoc lib crates.
cargo.arg("-p").arg("rustc_driver")
.arg("-p").arg("rustdoc");
// src/rustc/Cargo.toml contains a bin crate called rustc which
// would otherwise overwrite the docs for the real rustc lib crate.
cargo.arg("-p").arg("rustc_driver");
} else {
// Like with libstd above if compiler docs aren't enabled then we're not
// documenting internal dependencies, so we have a whitelist.
Expand Down

0 comments on commit ff8773d

Please sign in to comment.