Skip to content

Commit 4a917e0

Browse files
committed
rustbuild: Use tool_cmd() instead of tool()
This sets up the dynamic loader path for dylibs required, so should fix the MSVC build right now.
1 parent 6ccf03c commit 4a917e0

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/bootstrap/build/check.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::process::Command;
12-
1311
use build::{Build, Compiler};
1412

1513
pub fn linkcheck(build: &Build, stage: u32, host: &str) {
1614
println!("Linkcheck stage{} ({})", stage, host);
1715
let compiler = Compiler::new(stage, host);
18-
let linkchecker = build.tool(&compiler, "linkchecker");
19-
build.run(Command::new(&linkchecker)
20-
.arg(build.out.join(host).join("doc")));
16+
build.run(build.tool_cmd(&compiler, "linkchecker")
17+
.arg(build.out.join(host).join("doc")));
2118
}

src/bootstrap/build/doc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ pub fn rustc(build: &Build, stage: u32, host: &str, out: &Path) {
143143
pub fn error_index(build: &Build, stage: u32, host: &str, out: &Path) {
144144
println!("Documenting stage{} error index ({})", stage, host);
145145
let compiler = Compiler::new(stage, host);
146-
let mut index = Command::new(build.tool(&compiler, "error_index_generator"));
146+
let mut index = build.tool_cmd(&compiler, "error_index_generator");
147147
index.arg("html");
148148
index.arg(out.join("error-index.html"));
149149

0 commit comments

Comments
 (0)