diff options
| author | bors <bors@rust-lang.org> | 2022-12-22 13:59:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-22 13:59:15 +0000 |
| commit | e5e4eef02d443eae5089a330e59a69a4f350db81 (patch) | |
| tree | a263d6c7e6b87dea59a410ede56d46845de97ecb /src/bootstrap/builder.rs | |
| parent | 2d8651a92761421b0437ffb44ba5670bea5ee1df (diff) | |
| parent | 59b3157c45048edca3cb94841d799d2ab1fe3c43 (diff) | |
Auto merge of #106000 - nikic:lld-build, r=Mark-Simulacrum
Make LLD build forward-compatible with LLVM 16 Switch to using the cmake module instead of llvm-config. I believe this also removes the need for llvm-config-wrapper.
Diffstat (limited to 'src/bootstrap/builder.rs')
| -rw-r--r-- | src/bootstrap/builder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 1d37d68c1d4..b9d06a77966 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1068,7 +1068,7 @@ impl<'a> Builder<'a> { /// check build or dry-run, where there's no need to build all of LLVM. fn llvm_config(&self, target: TargetSelection) -> Option<PathBuf> { if self.config.llvm_enabled() && self.kind != Kind::Check && !self.config.dry_run() { - let llvm_config = self.ensure(native::Llvm { target }); + let native::LlvmResult { llvm_config, .. } = self.ensure(native::Llvm { target }); if llvm_config.is_file() { return Some(llvm_config); } |