about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-04-14 15:22:39 +0800
committerkennytm <kennytm@gmail.com>2018-04-14 15:22:39 +0800
commit44a71e2e6125aa1289a973d602057c4aecd2f600 (patch)
tree250458e154f396d9d78d269872043e9c6ac9a3cd
parent070a7719bbc15645f32e047289ecb73a94b9488c (diff)
parent6f10146f9f327bfebbae4083d40ffbeb412e3198 (diff)
downloadrust-44a71e2e6125aa1289a973d602057c4aecd2f600.tar.gz
rust-44a71e2e6125aa1289a973d602057c4aecd2f600.zip
Rollup merge of #49908 - chrisccoulson:fix-rustdoc-themes-test-without-rpath, r=Mark-Simulacrum
Fix test failure in src/tools/rustdoc-themes when rust.rpath = false

See https://github.com/rust-lang/rust/issues/49907
-rw-r--r--src/bootstrap/test.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index c175d2c6901..72995db959a 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -459,7 +459,7 @@ impl Step for RustdocTheme {
     }
 
     fn run(self, builder: &Builder) {
-        let rustdoc = builder.rustdoc(self.compiler.host);
+        let rustdoc = builder.out.join("bootstrap/debug/rustdoc");
         let mut cmd = builder.tool_cmd(Tool::RustdocTheme);
         cmd.arg(rustdoc.to_str().unwrap())
            .arg(builder.src.join("src/librustdoc/html/static/themes").to_str().unwrap())