diff options
| author | bors <bors@rust-lang.org> | 2018-07-09 23:08:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-09 23:08:51 +0000 |
| commit | 5b525916ee511a54d4e79dff8d854fc63ac8fff7 (patch) | |
| tree | 053870432a264fab277902d0f9ec05b5f45a4472 /src/bootstrap | |
| parent | 9bd8458c92f7166b827e4eb5cf5effba8c0e615d (diff) | |
| parent | 3b36ce64a55c32886a752e0935a4f5068d5f1678 (diff) | |
| download | rust-5b525916ee511a54d4e79dff8d854fc63ac8fff7.tar.gz rust-5b525916ee511a54d4e79dff8d854fc63ac8fff7.zip | |
Auto merge of #51899 - gnzlbg:llvm501, r=alexcrichton
bump minimum LLVM version to 5.0 Closes #51878 . r? @alexcrichton -- cc @cuviper @infinity0
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/native.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 93b8880a900..264acfacee6 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -256,12 +256,12 @@ 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 > 3 || (major == 3 && minor >= 9) { + if let (Some(major), Some(_minor)) = (parts.next(), parts.next()) { + if major >= 5 { return } } - panic!("\n\nbad LLVM version: {}, need >=3.9\n\n", version) + panic!("\n\nbad LLVM version: {}, need >=5.0\n\n", version) } fn configure_cmake(builder: &Builder, |