Skip to content

Commit

Permalink
Rollup merge of #37667 - alexcrichton:fix-llvm-version, r=japaric
Browse files Browse the repository at this point in the history
rustc_llvm: Require 3.9 for --link-static

Apparently stock Ubuntu 16.04 includes LLVM 3.8 which doesn't have this flag.
  • Loading branch information
eddyb authored Nov 10, 2016
2 parents e733667 + cc2c812 commit 3a5b45a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustc_llvm/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ fn main() {
let mut parts = version_output.split('.');
if let (Some(major), Some(minor)) = (parts.next().and_then(|s| s.parse::<u32>().ok()),
parts.next().and_then(|s| s.parse::<u32>().ok())) {
if major > 3 || (major == 3 && minor >= 8) {
if major > 3 || (major == 3 && minor >= 9) {
cmd.arg("--link-static");
}
}
Expand Down

0 comments on commit 3a5b45a

Please sign in to comment.