Skip to content

Commit

Permalink
Rollup merge of #114415 - Kobzol:bootstrap-check-vendor-gcc, r=ozkanonur
Browse files Browse the repository at this point in the history
Skip checking of `rustc_codegen_gcc` with vendoring enabled

`rustc_codegen_gcc` currently cannot be vendored, which [breaks](#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: #112393

r? bootstrap
  • Loading branch information
matthiaskrgr authored Aug 3, 2023
2 parents eada061 + c6232b1 commit c0c911b
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/bootstrap/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,12 @@ impl Step for CodegenBackend {
}

fn run(self, builder: &Builder<'_>) {
// FIXME: remove once https://github.com/rust-lang/rust/issues/112393 is resolved
if builder.build.config.vendor && &self.backend == "gcc" {
println!("Skipping checking of `rustc_codegen_gcc` with vendoring enabled.");
return;
}

let compiler = builder.compiler(builder.top_stage, builder.config.build);
let target = self.target;
let backend = self.backend;
Expand Down

0 comments on commit c0c911b

Please sign in to comment.