diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-06-26 00:39:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 00:39:04 -0700 |
| commit | 25671fa0fc70a172e4d441916549b162023e8919 (patch) | |
| tree | 3bc3af8fb0c34333fb0d680b13c7424bc9bfe6e9 | |
| parent | 10d655bb474c2437e38e2926fc3f4d792bd7f7e9 (diff) | |
| parent | 8a816cad27e288070f0f4a64cdf833440440d553 (diff) | |
| download | rust-25671fa0fc70a172e4d441916549b162023e8919.tar.gz rust-25671fa0fc70a172e4d441916549b162023e8919.zip | |
Rollup merge of #73507 - mati865:cleanup-mingw-llvm-linkage, r=matthewjasper
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).
| -rw-r--r-- | src/librustc_llvm/build.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs index ada48bc147e..d25f8bd1b8c 100644 --- a/src/librustc_llvm/build.rs +++ b/src/librustc_llvm/build.rs @@ -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"); } } |
