@@ -85,6 +85,8 @@ impl Step for Rustc {
85
85
let compiler = builder. compiler ( 0 , builder. config . build ) ;
86
86
let target = self . target ;
87
87
88
+ builder. ensure ( Test { target } ) ;
89
+
88
90
let mut cargo = builder. cargo ( compiler, Mode :: Rustc , target, "check" ) ;
89
91
rustc_cargo ( builder, & mut cargo) ;
90
92
@@ -132,8 +134,7 @@ impl Step for CodegenBackend {
132
134
let target = self . target ;
133
135
let backend = self . backend ;
134
136
135
- let out_dir = builder. cargo_out ( compiler, Mode :: Codegen , target) ;
136
- builder. clear_if_dirty ( & out_dir, & librustc_stamp ( builder, compiler, target) ) ;
137
+ builder. ensure ( Rustc { target } ) ;
137
138
138
139
let mut cargo = builder. cargo ( compiler, Mode :: Codegen , target, "check" ) ;
139
140
cargo. arg ( "--manifest-path" ) . arg ( builder. src . join ( "src/librustc_codegen_llvm/Cargo.toml" ) ) ;
@@ -173,6 +174,8 @@ impl Step for Test {
173
174
let compiler = builder. compiler ( 0 , builder. config . build ) ;
174
175
let target = self . target ;
175
176
177
+ builder. ensure ( Std { target } ) ;
178
+
176
179
let mut cargo = builder. cargo ( compiler, Mode :: Test , target, "check" ) ;
177
180
test_cargo ( builder, & compiler, target, & mut cargo) ;
178
181
@@ -213,10 +216,7 @@ impl Step for Rustdoc {
213
216
let compiler = builder. compiler ( 0 , builder. config . build ) ;
214
217
let target = self . target ;
215
218
216
- let stage_out = builder. stage_out ( compiler, Mode :: ToolRustc ) ;
217
- builder. clear_if_dirty ( & stage_out, & libstd_stamp ( builder, compiler, target) ) ;
218
- builder. clear_if_dirty ( & stage_out, & libtest_stamp ( builder, compiler, target) ) ;
219
- builder. clear_if_dirty ( & stage_out, & librustc_stamp ( builder, compiler, target) ) ;
219
+ builder. ensure ( Rustc { target } ) ;
220
220
221
221
let mut cargo = prepare_tool_cargo ( builder,
222
222
compiler,
0 commit comments