@@ -142,7 +142,7 @@ impl Step for Std {
142142 }
143143
144144 let _guard = builder. msg_clippy (
145- format_args ! ( "library artifacts {}" , crate_description( & self . crates) ) ,
145+ format_args ! ( "library{}" , crate_description( & self . crates) ) ,
146146 target,
147147 ) ;
148148
@@ -187,17 +187,8 @@ impl Step for Rustc {
187187 let compiler = builder. compiler ( builder. top_stage , builder. config . build ) ;
188188 let target = self . target ;
189189
190- if compiler. stage != 0 {
191- // If we're not in stage 0, then we won't have a std from the beta
192- // compiler around. That means we need to make sure there's one in
193- // the sysroot for the compiler to find. Otherwise, we're going to
194- // fail when building crates that need to generate code (e.g., build
195- // scripts and their dependencies).
196- builder. ensure ( compile:: Std :: new ( compiler, compiler. host ) ) ;
197- builder. ensure ( compile:: Std :: new ( compiler, target) ) ;
198- } else {
199- builder. ensure ( check:: Std :: new ( target) ) ;
200- }
190+ builder. ensure ( compile:: Std :: new ( compiler, compiler. host ) ) ;
191+ builder. ensure ( compile:: Std :: new ( compiler, target) ) ;
201192
202193 let mut cargo = builder:: Cargo :: new (
203194 builder,
@@ -218,7 +209,7 @@ impl Step for Rustc {
218209 }
219210
220211 let _guard = builder. msg_clippy (
221- format_args ! ( "compiler artifacts {}" , crate_description( & self . crates) ) ,
212+ format_args ! ( "compiler{}" , crate_description( & self . crates) ) ,
222213 target,
223214 ) ;
224215
0 commit comments