Skip to content

Commit

Permalink
Rollup merge of #73507 - mati865:cleanup-mingw-llvm-linkage, r=matthe…
Browse files Browse the repository at this point in the history
…wjasper

Cleanup MinGW LLVM linkage workaround

LLVM correctly passes `uuid` for a long time, GCC unwinding library (either static or dynamic) comes from [windows_gnu_base](https://github.com/rust-lang/rust/blob/06e47688bf15d0215edbe05b21603062f6d2eb5d/src/librustc_target/spec/windows_gnu_base.rs).
  • Loading branch information
Manishearth authored Jun 26, 2020
2 parents 10d655b + 8a816ca commit 25671fa
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/librustc_llvm/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,9 @@ fn main() {
}
}

// LLVM requires symbols from this library, but apparently they're not printed
// during llvm-config?
// Libstdc++ depends on pthread which Rust doesn't link on MinGW
// since nothing else requires it.
if target.contains("windows-gnu") {
println!("cargo:rustc-link-lib=static-nobundle=gcc_s");
println!("cargo:rustc-link-lib=static-nobundle=pthread");
println!("cargo:rustc-link-lib=dylib=uuid");
}
}

0 comments on commit 25671fa

Please sign in to comment.