about summary refs log tree commit diff
path: root/src/libstd/build.rs
diff options
context:
space:
mode:
authorJorge Aparicio <japaricious@gmail.com>2016-03-06 08:19:51 -0500
committerJorge Aparicio <japaricious@gmail.com>2016-03-06 08:19:51 -0500
commit0b7fc0653bfd19f650a2fbad987b2fe03715e6b4 (patch)
tree5d778f54cf1fa06d0382944ed47a68a93c74367f /src/libstd/build.rs
parentc116ae35cf49b55bd8d82e31f1ba030cf7e63867 (diff)
rustbuild: fix cross compilation of libstd to i686-unknown-linux-musl
- make sure we copy the third party objects (crt*.o) to the target stage directory.
- apply the x86_64-musl logic also to the i686-musl target.
Diffstat (limited to 'src/libstd/build.rs')
-rw-r--r--src/libstd/build.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/build.rs b/src/libstd/build.rs
index c60ec4d3655..1c8375479ca 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") && target.contains("x86_64") {
+        if target.contains("musl") && (target.contains("x86_64") || target.contains("i686")) {
             println!("cargo:rustc-link-lib=static=unwind");
         } else {
             println!("cargo:rustc-link-lib=dl");