about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorJorge Aparicio <japaricious@gmail.com>2016-08-10 14:35:09 -0500
committerJorge Aparicio <japaricious@gmail.com>2016-08-10 14:35:09 -0500
commitae58a875945eaf2d827a6acae0b9900a5426537c (patch)
tree66a1cbbebcc8a041bfa1950c35f78adaffdfa66b /src/bootstrap
parentae774103501337ed63b42b673c6c4fdbf369e80e (diff)
downloadrust-ae58a875945eaf2d827a6acae0b9900a5426537c.tar.gz
rust-ae58a875945eaf2d827a6acae0b9900a5426537c.zip
add -mrelax-relocations=no to i686-musl and i586-gnu
I've been experiencing #34978 with these two targets. This applies the
hack in #35178 to these targets as well.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/lib.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index acb7e0fadd9..239adedc0ff 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -858,8 +858,12 @@ impl Build {
         // This is a hack, because newer binutils broke things on some vms/distros
         // (i.e., linking against unknown relocs disabled by the following flag)
         // See: https://github.com/rust-lang/rust/issues/34978
-        if target == "x86_64-unknown-linux-musl" {
-            base.push("-Wa,-mrelax-relocations=no".into());
+        match target {
+            "i586-unknown-linux-gnu" |
+            "i686-unknown-linux-musl" |
+            "x86_64-unknown-linux-musl" => {
+                base.push("-Wa,-mrelax-relocations=no".into());
+            }
         }
         return base
     }