Skip to content

Commit 24a0d3c

Browse files
authored
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.
2 parents e2769c7 + 0cb460b commit 24a0d3c

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)