about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2016-11-10 03:46:29 +0200
committerGitHub <noreply@github.com>2016-11-10 03:46:29 +0200
commit3a5b45aae5142635e2b14c139a69c684bf3f1a19 (patch)
tree54feb105a675900a9f79995fa38583a9bc2a1f9b /src
parente733667210cb6cfe7cc6ba9c817dd0c977bb2fed (diff)
parentcc2c812701c9bc1ac4a4165f37bacbe69c80a334 (diff)
Rollup merge of #37667 - alexcrichton:fix-llvm-version, r=japaric
rustc_llvm: Require 3.9 for --link-static

Apparently stock Ubuntu 16.04 includes LLVM 3.8 which doesn't have this flag.
Diffstat (limited to 'src')
-rw-r--r--src/librustc_llvm/build.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
index 4d3a4d09dce..8656bb8bf00 100644
--- 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");
         }
     }