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

These targets don't link statically to libunwind or libc
rust-lang · Mar 3, 2016 · ddd2e99 · ddd2e99
1 parent f6e125f
commit ddd2e99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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");