bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #104572 - pkubaj:patch-1, r=cuviper

Browse source 
Fix build on powerpc-unknown-freebsd

Probably also fixes build on arm and mips*. Related to https://github.com/rust-lang/rust/issues/104220
This commit is contained in:
bors 2022-12-09 12:00:58 +00:00
commit e10201c9bb
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_llvm/build.rs
View file

@ -238,18 +238,20 @@ fn main() {
if !is_crossed { if !is_crossed {
cmd.arg("--system-libs"); cmd.arg("--system-libs");
} else if target.contains("windows-gnu") { }
println!("cargo:rustc-link-lib=shell32");
println!("cargo:rustc-link-lib=uuid"); if (target.starts_with("arm") && !target.contains("freebsd"))
} else if target.contains("netbsd") || target.contains("haiku") || target.contains("darwin") {
println!("cargo:rustc-link-lib=z");
} else if target.starts_with("arm")
|| target.starts_with("mips-") || target.starts_with("mips-")
|| target.starts_with("mipsel-") || target.starts_with("mipsel-")
|| target.starts_with("powerpc-") || target.starts_with("powerpc-")
{ {
// 32-bit targets need to link libatomic. // 32-bit targets need to link libatomic.
println!("cargo:rustc-link-lib=atomic"); println!("cargo:rustc-link-lib=atomic");
} else if target.contains("windows-gnu") {
println!("cargo:rustc-link-lib=shell32");
println!("cargo:rustc-link-lib=uuid");
} else if target.contains("netbsd") || target.contains("haiku") || target.contains("darwin") {
println!("cargo:rustc-link-lib=z");
} }
cmd.args(&components); cmd.args(&components);