Rollup merge of #40019 - alexcrichton:fix-musl, r=brson
travis: Compile a more compatible libc.a for musl The mitigations for #34978 involve passing `-Wa,-mrelax-relocations=no` to all C code we compile, and we just forgot to pass it when compiling musl itself. Closes #39979
This commit is contained in:
@@ -832,17 +832,6 @@ impl Build {
|
||||
if target.contains("apple-darwin") {
|
||||
base.push("-stdlib=libc++".into());
|
||||
}
|
||||
// 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
|
||||
match target {
|
||||
"i586-unknown-linux-gnu" |
|
||||
"i686-unknown-linux-musl" |
|
||||
"x86_64-unknown-linux-musl" => {
|
||||
base.push("-Wa,-mrelax-relocations=no".into());
|
||||
},
|
||||
_ => {},
|
||||
}
|
||||
return base
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user