From 4e5333cb2ba70b49a17c3c124bc47feba7fd761c Mon Sep 17 00:00:00 2001 From: Mark Simulacrum Date: Tue, 25 Jul 2017 16:54:33 -0600 Subject: Don't needlessly build rustdoc for compiletest. For most tests, rustdoc isn't needed, so avoid building it. --- src/bootstrap/check.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/bootstrap') 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)); -- cgit 1.4.1-3-g733a5