diff options
| author | bors <bors@rust-lang.org> | 2023-07-29 14:57:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-29 14:57:47 +0000 |
| commit | 4c968227965f101e41bda8a38ff02fd1baee28c4 (patch) | |
| tree | 9194769552f852f142014e2e17957ab66bbc229a /src/bootstrap | |
| parent | f9f674f2bcf9cb67ef29123dd3a631485cba22c8 (diff) | |
| parent | da47736f42307e450a447889ebc563cddaf93ac2 (diff) | |
| download | rust-4c968227965f101e41bda8a38ff02fd1baee28c4.tar.gz rust-4c968227965f101e41bda8a38ff02fd1baee28c4.zip | |
Auto merge of #114148 - cuviper:drop-llvm-14, r=nikic
Update the minimum external LLVM to 15 With this change, we'll have stable support for LLVM 15 through 17 (pending release). For reference, the previous increase to LLVM 14 was #107573.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/llvm.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/llvm.rs b/src/bootstrap/llvm.rs index 02fef4b3e83..90007fc8ba1 100644 --- a/src/bootstrap/llvm.rs +++ b/src/bootstrap/llvm.rs @@ -525,11 +525,11 @@ fn check_llvm_version(builder: &Builder<'_>, llvm_config: &Path) { let version = output(cmd.arg("--version")); let mut parts = version.split('.').take(2).filter_map(|s| s.parse::<u32>().ok()); if let (Some(major), Some(_minor)) = (parts.next(), parts.next()) { - if major >= 14 { + if major >= 15 { return; } } - panic!("\n\nbad LLVM version: {}, need >=14.0\n\n", version) + panic!("\n\nbad LLVM version: {}, need >=15.0\n\n", version) } fn configure_cmake( |
