Skip to content

Commit a022de6

Browse files
committed
Rollup merge of rust-lang#32027 - japaric:rustbuild-mips, r=alexcrichton
These targets don't link statically to libunwind or libc --- r? @alexcrichton
2 parents 5d9c6c1 + ddd2e99 commit a022de6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/bootstrap/build/sanity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ pub fn check(build: &mut Build) {
7979
}
8080

8181
// Make sure musl-root is valid if specified
82-
if target.contains("musl") {
82+
if target.contains("musl") && target.contains("x86_64") {
8383
match build.config.musl_root {
8484
Some(ref root) => {
8585
if fs::metadata(root.join("lib/libc.a")).is_err() {

src/libstd/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fn main() {
2828
}
2929

3030
if target.contains("unknown-linux") {
31-
if target.contains("musl") {
31+
if target.contains("musl") && target.contains("x86_64") {
3232
println!("cargo:rustc-link-lib=static=unwind");
3333
} else {
3434
println!("cargo:rustc-link-lib=dl");

0 commit comments

Comments
 (0)