From dbe23899ccb09120ea76c444a1186829daa4f33f Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 8 Mar 2016 16:15:58 -0500 Subject: [PATCH] cover more linux targets in libstd cargobuild --- src/libstd/build.rs | 10 +++++----- 1 file 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"); -- GitLab