bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #77690 - est31:llvm_8_required, r=matthewjasper

Browse source 
Simplify some code in rustc_llvm/build.rs now that LLVM 8 is required

LLVM 8 is required since 8506bb0060
so this is safe to do.
This commit is contained in:
bors 2020-10-09 12:23:49 +00:00
commit 53a4c3b0ba
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_llvm/build.rs
View file

@ -70,7 +70,7 @@ fn main() {
let host = env::var("HOST").expect("HOST was not set"); let host = env::var("HOST").expect("HOST was not set");
let is_crossed = target != host; let is_crossed = target != host;
let mut optional_components = vec![ let optional_components = &[
"x86", "x86",
"arm", "arm",
"aarch64", "aarch64",
@ -85,6 +85,7 @@ fn main() {
"sparc", "sparc",
"nvptx", "nvptx",
"hexagon", "hexagon",
"riscv",
]; ];
let mut version_cmd = Command::new(&llvm_config); let mut version_cmd = Command::new(&llvm_config);
@ -94,13 +95,9 @@ fn main() {
let (major, _minor) = if let (Some(major), Some(minor)) = (parts.next(), parts.next()) { let (major, _minor) = if let (Some(major), Some(minor)) = (parts.next(), parts.next()) {
(major, minor) (major, minor)
} else { } else {
(6, 0) (8, 0)
}; };
if major > 6 {
optional_components.push("riscv");
}
let required_components = &[ let required_components = &[
"ipo", "ipo",
"bitreader", "bitreader",