diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-08-03 17:29:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-03 17:29:10 +0200 |
| commit | c0c911b697bf18a2e1102696487b9f47c0e6eeb9 (patch) | |
| tree | 9e75f2fea3930c9c5b0df32d16bb72d6221393d9 | |
| parent | eada0614abb58bef1cb286a7b930bf25c0890715 (diff) | |
| parent | c6232b14fdb9d7020421746bd75468bc80b95be3 (diff) | |
| download | rust-c0c911b697bf18a2e1102696487b9f47c0e6eeb9.tar.gz rust-c0c911b697bf18a2e1102696487b9f47c0e6eeb9.zip | |
Rollup merge of #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](https://github.com/rust-lang/rust/issues/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: https://github.com/rust-lang/rust/issues/112393 r? bootstrap
| -rw-r--r-- | src/bootstrap/check.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs index 2c51ed5408e..bdefc41c9c7 100644 --- a/src/bootstrap/check.rs +++ b/src/bootstrap/check.rs @@ -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; |