about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorOliver Middleton <olliemail27@gmail.com>2020-03-13 23:24:12 +0000
committerOliver Middleton <olliemail27@gmail.com>2020-03-13 23:24:12 +0000
commit3f58ab6e24af34265229f701d48eb240cc06d751 (patch)
tree6a226e2f9929cc870eef5d4b31213047b269d730 /src/bootstrap
parent965888adc20f46799f382065142dbb0e27905d9c (diff)
Allow `rustdoc-js` and `rustdoc-js-std` to use none default build dir location
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/test.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 1b9e9a88948..66fd2985cb4 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -607,7 +607,6 @@ impl Step for RustdocTheme {
 
 #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
 pub struct RustdocJSStd {
-    pub host: Interned<String>,
     pub target: Interned<String>,
 }
 
@@ -621,13 +620,16 @@ impl Step for RustdocJSStd {
     }
 
     fn make_run(run: RunConfig<'_>) {
-        run.builder.ensure(RustdocJSStd { host: run.host, target: run.target });
+        run.builder.ensure(RustdocJSStd { target: run.target });
     }
 
     fn run(self, builder: &Builder<'_>) {
         if let Some(ref nodejs) = builder.config.nodejs {
             let mut command = Command::new(nodejs);
-            command.args(&["src/tools/rustdoc-js-std/tester.js", &*self.host]);
+            command
+                .arg(builder.src.join("src/tools/rustdoc-js-std/tester.js"))
+                .arg(builder.doc_out(self.target))
+                .arg(builder.src.join("src/test/rustdoc-js-std"));
             builder.ensure(crate::doc::Std { target: self.target, stage: builder.top_stage });
             builder.run(&mut command);
         } else {