Skip to content

Commit c0c911b

Browse files
authored
Rollup merge of rust-lang#114415 - Kobzol:bootstrap-check-vendor-gcc, r=ozkanonur
Skip checking of `rustc_codegen_gcc` with vendoring enabled `rustc_codegen_gcc` currently cannot be vendored, which [breaks](rust-lang#112393) `x.py check` with vendoring enabled. Until the vendoring issue is resolved, it would be nice if `x.py check` could succeed (and just skip `gcc`) with `vendor = true`. With this PR, it does. Related issue: rust-lang#112393 r? bootstrap
2 parents eada061 + c6232b1 commit c0c911b

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/bootstrap/check.rs

+6
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,12 @@ impl Step for CodegenBackend {
307307
}
308308

309309
fn run(self, builder: &Builder<'_>) {
310+
// FIXME: remove once https://github.com/rust-lang/rust/issues/112393 is resolved
311+
if builder.build.config.vendor && &self.backend == "gcc" {
312+
println!("Skipping checking of `rustc_codegen_gcc` with vendoring enabled.");
313+
return;
314+
}
315+
310316
let compiler = builder.compiler(builder.top_stage, builder.config.build);
311317
let target = self.target;
312318
let backend = self.backend;

0 commit comments

Comments
 (0)