diff options
| author | bors <bors@rust-lang.org> | 2021-10-23 20:59:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-23 20:59:29 +0000 |
| commit | 45591408b18e7f93fcf8c09210c9a5a102d84b37 (patch) | |
| tree | 5344f3519ec782c658ef5770dc02fe4178b99931 /src/bootstrap | |
| parent | 91b931926fd49fc97d1e39f2b8206abf1d77ce7d (diff) | |
| parent | 8b1504cfb73894040f8096623e6f9d4559c9eb7f (diff) | |
| download | rust-45591408b18e7f93fcf8c09210c9a5a102d84b37.tar.gz rust-45591408b18e7f93fcf8c09210c9a5a102d84b37.zip | |
Auto merge of #90175 - cuviper:min-llvm-12, r=nagisa
Update the minimum external LLVM to 12 With this change, we'll have stable support for LLVM 12 and 13. For reference, the previous increase to LLVM 10 was #83387, and this replaces the pending increase to LLVM 11 in #90062. r? `@nagisa` `@nikic`
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/native.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 6bfaeffa807..37578e30f6d 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -378,11 +378,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 >= 10 { + if major >= 12 { return; } } - panic!("\n\nbad LLVM version: {}, need >=10.0\n\n", version) + panic!("\n\nbad LLVM version: {}, need >=12.0\n\n", version) } fn configure_cmake( |