diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-02-11 01:37:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-11 01:37:56 +0100 |
| commit | 955cbdfdaf8e2f22742a63395e513174d57ede34 (patch) | |
| tree | 69712ad0ed5a6b85d2d19cd16657907757ec4a1c /compiler/rustc_mir_transform/src/errors.rs | |
| parent | 09bbcd6667631e31c63e9f8d1c930e2bab5ebeb3 (diff) | |
| parent | fd470e58c2282755bc6cbd5ef318577d2eb10322 (diff) | |
| download | rust-955cbdfdaf8e2f22742a63395e513174d57ede34.tar.gz rust-955cbdfdaf8e2f22742a63395e513174d57ede34.zip | |
Rollup merge of #120890 - TimNN:relax-patches-check, r=onur-ozkan
Adapt `llvm-has-rust-patches` validation to take `llvm-config` into account. This adapts an assertion that was added in #119556. The current assertion does not take the `llvm-config` setting into accounts, which does not match the `llvm-has-rust-patches` documentation, which states: > This would be used in conjunction with either an llvm-config or build.submodules = false. (It also breaks my workflow: I build LLVM separately, but do have the rust patches applied). --- **edit:** Originally this PR just removed the assertion, but it now implements the alternative mentioned here: An alternative fix would be to take `llvm-config` into account in the assertion, but to me the assertion seems to provide little value, thus the simpler fix of just removing it. cc `@onur-ozkan,` in case I'm missing a reason to keep the assertion.
Diffstat (limited to 'compiler/rustc_mir_transform/src/errors.rs')
0 files changed, 0 insertions, 0 deletions