Skip to content

Commit 9ee877b

Browse files
Correct a few run.host invocations where run.target is intended.
1 parent 3c43163 commit 9ee877b

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/bootstrap/check.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl Step for Linkcheck {
119119
}
120120

121121
fn make_run(run: RunConfig) {
122-
run.builder.ensure(Linkcheck { host: run.host });
122+
run.builder.ensure(Linkcheck { host: run.target });
123123
}
124124
}
125125

@@ -140,7 +140,7 @@ impl Step for Cargotest {
140140
fn make_run(run: RunConfig) {
141141
run.builder.ensure(Cargotest {
142142
stage: run.builder.top_stage,
143-
host: run.host,
143+
host: run.target,
144144
});
145145
}
146146

src/bootstrap/doc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ impl Step for TheBook {
192192

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

297297
fn make_run(run: RunConfig) {
298298
run.builder.ensure(Standalone {
299-
compiler: run.builder.compiler(run.builder.top_stage, run.host),
299+
compiler: run.builder.compiler(run.builder.top_stage, run.builder.build.build),
300300
target: run.target,
301301
});
302302
}

src/bootstrap/tool.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -247,17 +247,17 @@ impl Step for Rustdoc {
247247
fn run(self, builder: &Builder) -> PathBuf {
248248
let target_compiler = self.target_compiler;
249249
let build_compiler = if target_compiler.stage == 0 {
250-
target_compiler
250+
builder.compiler(0, builder.build.build)
251251
} else {
252252
// Similar to `compile::Assemble`, build with the previous stage's compiler. Otherwise
253253
// we'd have stageN/bin/rustc and stageN/bin/rustdoc be effectively different stage
254254
// compilers, which isn't what we want.
255-
builder.compiler(target_compiler.stage - 1, target_compiler.host)
255+
builder.compiler(target_compiler.stage - 1, builder.build.build)
256256
};
257257

258258
let tool_rustdoc = builder.ensure(ToolBuild {
259259
compiler: build_compiler,
260-
target: build_compiler.host,
260+
target: target_compiler.host,
261261
tool: "rustdoc",
262262
mode: Mode::Librustc,
263263
});

0 commit comments

Comments
 (0)