user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct a few run.host invocations where run.target is intended.

Browse source
This commit is contained in:
Mark Simulacrum 2017-07-27 06:50:43 -06:00
parent 3c43163da7
commit 9ee877bbe6
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/check.rs
View file

@ -119,7 +119,7 @@ impl Step for Linkcheck {
}
fn make_run(run: RunConfig) {
run.builder.ensure(Linkcheck { host: run.host });
run.builder.ensure(Linkcheck { host: run.target });
}
}
@ -140,7 +140,7 @@ impl Step for Cargotest {
fn make_run(run: RunConfig) {
run.builder.ensure(Cargotest {
stage: run.builder.top_stage,
host: run.host,
host: run.target,
});
}

4
src/bootstrap/doc.rs
View file

@ -192,7 +192,7 @@ impl Step for TheBook {
fn make_run(run: RunConfig) {
run.builder.ensure(TheBook {
compiler: run.builder.compiler(run.builder.top_stage, run.host),
compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
target: run.target,
name: "book",
});
@ -296,7 +296,7 @@ impl Step for Standalone {
fn make_run(run: RunConfig) {
run.builder.ensure(Standalone {
compiler: run.builder.compiler(run.builder.top_stage, run.host),
compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
target: run.target,
});
}

6
src/bootstrap/tool.rs
View file

@ -247,17 +247,17 @@ impl Step for Rustdoc {
fn run(self, builder: &Builder) -> PathBuf {
let target_compiler = self.target_compiler;
let build_compiler = if target_compiler.stage == 0 {
target_compiler
builder.compiler(0, builder.build.build)
} else {
// Similar to `compile::Assemble`, build with the previous stage's compiler. Otherwise
// we'd have stageN/bin/rustc and stageN/bin/rustdoc be effectively different stage
// compilers, which isn't what we want.
builder.compiler(target_compiler.stage - 1, target_compiler.host)
builder.compiler(target_compiler.stage - 1, builder.build.build)
};
let tool_rustdoc = builder.ensure(ToolBuild {
compiler: build_compiler,
target: build_compiler.host,
target: target_compiler.host,
tool: "rustdoc",
mode: Mode::Librustc,
});