about summary refs log tree commit diff
diff options
context:
space:
mode:
authorarcnmx <arcnmx@users.noreply.github.com>2016-03-08 16:15:58 -0500
committerarcnmx <arcnmx@users.noreply.github.com>2016-03-08 16:15:58 -0500
commitdbe23899ccb09120ea76c444a1186829daa4f33f (patch)
treeac1d51c317f3b36d4cb526853af95f635583dc04
parent8f0479b2a5fc16814b68efe9e87dddf231b8941d (diff)
downloadrust-dbe23899ccb09120ea76c444a1186829daa4f33f.tar.gz
rust-dbe23899ccb09120ea76c444a1186829daa4f33f.zip
cover more linux targets in libstd cargobuild
-rw-r--r--src/libstd/build.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/build.rs b/src/libstd/build.rs
index 1c8375479ca..4a835e9f503 100644
--- a/src/libstd/build.rs
+++ b/src/libstd/build.rs
@@ -27,19 +27,19 @@ fn main() {
         build_libbacktrace(&host, &target);
     }
 
-    if target.contains("unknown-linux") {
+    if target.contains("linux") {
         if target.contains("musl") && (target.contains("x86_64") || target.contains("i686")) {
             println!("cargo:rustc-link-lib=static=unwind");
+        } else if target.contains("android") {
+            println!("cargo:rustc-link-lib=dl");
+            println!("cargo:rustc-link-lib=log");
+            println!("cargo:rustc-link-lib=gcc");
         } else {
             println!("cargo:rustc-link-lib=dl");
             println!("cargo:rustc-link-lib=rt");
             println!("cargo:rustc-link-lib=pthread");
             println!("cargo:rustc-link-lib=gcc_s");
         }
-    } else if target.contains("android") {
-        println!("cargo:rustc-link-lib=dl");
-        println!("cargo:rustc-link-lib=log");
-        println!("cargo:rustc-link-lib=gcc");
     } else if target.contains("freebsd") {
         println!("cargo:rustc-link-lib=execinfo");
         println!("cargo:rustc-link-lib=pthread");