From ddd2e99d0235b968fffab9e6ae94c660a1fb85de Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Thu, 3 Mar 2016 14:50:28 -0500 Subject: [PATCH] [rustbuild] fix cross compilation of std for mips(el)-linux-musl These targets don't link statically to libunwind or libc --- src/bootstrap/build/sanity.rs | 2 +- src/libstd/build.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/build/sanity.rs b/src/bootstrap/build/sanity.rs index 40f4c7076092d..6ac581a7c6949 100644 --- a/src/bootstrap/build/sanity.rs +++ b/src/bootstrap/build/sanity.rs @@ -79,7 +79,7 @@ pub fn check(build: &mut Build) { } // Make sure musl-root is valid if specified - if target.contains("musl") { + if target.contains("musl") && target.contains("x86_64") { match build.config.musl_root { Some(ref root) => { if fs::metadata(root.join("lib/libc.a")).is_err() { diff --git a/src/libstd/build.rs b/src/libstd/build.rs index a1144a964fd37..c60ec4d3655b0 100644 --- a/src/libstd/build.rs +++ b/src/libstd/build.rs @@ -28,7 +28,7 @@ fn main() { } if target.contains("unknown-linux") { - if target.contains("musl") { + if target.contains("musl") && target.contains("x86_64") { println!("cargo:rustc-link-lib=static=unwind"); } else { println!("cargo:rustc-link-lib=dl");