diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-07-25 16:54:33 -0600 |
|---|---|---|
| committer | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-07-27 05:51:22 -0600 |
| commit | 4e5333cb2ba70b49a17c3c124bc47feba7fd761c (patch) | |
| tree | 451794948a5a5c9e26236266590028a7f5133af6 /src/bootstrap | |
| parent | e2e9b40e9aff842928c65606e47d9203a848a4e9 (diff) | |
| download | rust-4e5333cb2ba70b49a17c3c124bc47feba7fd761c.tar.gz rust-4e5333cb2ba70b49a17c3c124bc47feba7fd761c.zip | |
Don't needlessly build rustdoc for compiletest.
For most tests, rustdoc isn't needed, so avoid building it.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/check.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index 3b3b062b151..df15cbc9314 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -562,7 +562,12 @@ impl Step for Compiletest { cmd.arg("--compile-lib-path").arg(builder.rustc_libdir(compiler)); cmd.arg("--run-lib-path").arg(builder.sysroot_libdir(compiler, target)); cmd.arg("--rustc-path").arg(builder.rustc(compiler)); - cmd.arg("--rustdoc-path").arg(builder.rustdoc(compiler)); + + // Avoid depending on rustdoc when we don't need it. + if mode == "rustdoc" || mode == "run-make" { + cmd.arg("--rustdoc-path").arg(builder.rustdoc(compiler)); + } + cmd.arg("--src-base").arg(build.src.join("src/test").join(suite)); cmd.arg("--build-base").arg(testdir(build, compiler.host).join(suite)); cmd.arg("--stage-id").arg(format!("stage{}-{}", compiler.stage, target)); |
