Skip to content

Commit 53a4c3b

Browse files
committed
Auto merge of #77690 - est31:llvm_8_required, r=matthewjasper
Simplify some code in rustc_llvm/build.rs now that LLVM 8 is required LLVM 8 is required since 8506bb0 so this is safe to do.
2 parents 6b8b396 + 8b8e706 commit 53a4c3b

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

compiler/rustc_llvm/build.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fn main() {
7070
let host = env::var("HOST").expect("HOST was not set");
7171
let is_crossed = target != host;
7272

73-
let mut optional_components = vec![
73+
let optional_components = &[
7474
"x86",
7575
"arm",
7676
"aarch64",
@@ -85,6 +85,7 @@ fn main() {
8585
"sparc",
8686
"nvptx",
8787
"hexagon",
88+
"riscv",
8889
];
8990

9091
let mut version_cmd = Command::new(&llvm_config);
@@ -94,13 +95,9 @@ fn main() {
9495
let (major, _minor) = if let (Some(major), Some(minor)) = (parts.next(), parts.next()) {
9596
(major, minor)
9697
} else {
97-
(6, 0)
98+
(8, 0)
9899
};
99100

100-
if major > 6 {
101-
optional_components.push("riscv");
102-
}
103-
104101
let required_components = &[
105102
"ipo",
106103
"bitreader",

0 commit comments

Comments
 (0)