Rollup merge of #37667 - alexcrichton:fix-llvm-version, r=japaric

eddyb · web-flow · commit 3a5b45aae514 · 2016-11-10T03:46:29.000+02:00
rustc_llvm: Require 3.9 for --link-static

Apparently stock Ubuntu 16.04 includes LLVM 3.8 which doesn't have this flag.
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
@@ -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");
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ fn main() {`
`136`	`136`	`let mut parts = version_output.split('.');`
`137`	`137`	`if let (Some(major), Some(minor)) = (parts.next().and_then(\|s\| s.parse::<u32>().ok()),`
`138`	`138`	`parts.next().and_then(\|s\| s.parse::<u32>().ok())) {`
`139`		`- if major > 3 \|\| (major == 3 && minor >= 8) {`
	`139`	`+ if major > 3 \|\| (major == 3 && minor >= 9) {`
`140`	`140`	`cmd.arg("--link-static");`
`141`	`141`	`}`
`142`	`142`	`}`