Skip to content

Commit

Permalink
Add check build dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark-Simulacrum committed Sep 12, 2018
1 parent b585893 commit 9681e13
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/bootstrap/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ impl Step for Rustc {
let compiler = builder.compiler(0, builder.config.build);
let target = self.target;

builder.ensure(Test { target });

let mut cargo = builder.cargo(compiler, Mode::Rustc, target, "check");
rustc_cargo(builder, &mut cargo);

Expand Down Expand Up @@ -132,8 +134,7 @@ impl Step for CodegenBackend {
let target = self.target;
let backend = self.backend;

let out_dir = builder.cargo_out(compiler, Mode::Codegen, target);
builder.clear_if_dirty(&out_dir, &librustc_stamp(builder, compiler, target));
builder.ensure(Rustc { target });

let mut cargo = builder.cargo(compiler, Mode::Codegen, target, "check");
cargo.arg("--manifest-path").arg(builder.src.join("src/librustc_codegen_llvm/Cargo.toml"));
Expand Down Expand Up @@ -173,6 +174,8 @@ impl Step for Test {
let compiler = builder.compiler(0, builder.config.build);
let target = self.target;

builder.ensure(Std { target });

let mut cargo = builder.cargo(compiler, Mode::Test, target, "check");
test_cargo(builder, &compiler, target, &mut cargo);

Expand Down Expand Up @@ -213,10 +216,7 @@ impl Step for Rustdoc {
let compiler = builder.compiler(0, builder.config.build);
let target = self.target;

let stage_out = builder.stage_out(compiler, Mode::ToolRustc);
builder.clear_if_dirty(&stage_out, &libstd_stamp(builder, compiler, target));
builder.clear_if_dirty(&stage_out, &libtest_stamp(builder, compiler, target));
builder.clear_if_dirty(&stage_out, &librustc_stamp(builder, compiler, target));
builder.ensure(Rustc { target });

let mut cargo = prepare_tool_cargo(builder,
compiler,
Expand Down

0 comments on commit 9681e13

Please sign in to comment.