[rustbuild] fix cross compilation of std for mips(el)-linux-musl

These targets don't link statically to libunwind or libc

diff --git a/src/bootstrap/build/sanity.rs b/src/bootstrap/build/sanity.rs
index 40f4c7076092d78f5e70dcfe16182f4fcf0a195a..6ac581a7c69492f7ff8fd61d6b94a5cf6ab383bc 100644 (file)
--- 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 a1144a964fd37ea6016cb2b24237cf3bfbe7891e..c60ec4d3655b0bd0ccb63aca396c2a0f48962932 100644 (file)
--- 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");