about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJorge Aparicio <japaricious@gmail.com>2016-03-03 14:50:28 -0500
committerJorge Aparicio <japaricious@gmail.com>2016-03-03 14:50:28 -0500
commitddd2e99d0235b968fffab9e6ae94c660a1fb85de (patch)
tree66e906deb1bfa58cc8d55e8ebd2dec630967304f
parentf6e125f04a54ec65eac0ecd3cb68e180210a06fa (diff)
downloadrust-ddd2e99d0235b968fffab9e6ae94c660a1fb85de.tar.gz
rust-ddd2e99d0235b968fffab9e6ae94c660a1fb85de.zip
[rustbuild] fix cross compilation of std for mips(el)-linux-musl
These targets don't link statically to libunwind or libc
-rw-r--r--src/bootstrap/build/sanity.rs2
-rw-r--r--src/libstd/build.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/build/sanity.rs b/src/bootstrap/build/sanity.rs
index 40f4c707609..6ac581a7c69 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 a1144a964fd..c60ec4d3655 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");