libgcc_eh may depend on libpthread.

Make sure we link to the static libpthread, so that compiled Rust binaries do not depend on winpthread1.dll.
rust-lang · Mar 30, 2017 · 7c2fc62 · 7c2fc62
1 parent 78c3a49
commit 7c2fc62
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs
@@ -35,7 +35,8 @@ fn main() {
     } else if target.contains("dragonfly") {
         println!("cargo:rustc-link-lib=gcc_pic");
     } else if target.contains("windows-gnu") {
-        println!("cargo:rustc-link-lib=gcc_eh");
+        println!("cargo:rustc-link-lib=static-nobundle=gcc_eh");
+        println!("cargo:rustc-link-lib=static-nobundle=pthread");
     } else if target.contains("fuchsia") {
         println!("cargo:rustc-link-lib=unwind");
     }

diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs
@@ -17,6 +17,7 @@
 #![feature(cfg_target_vendor)]
 #![feature(staged_api)]
 #![feature(unwind_attributes)]
+#![feature(static_nobundle)]
 
 #![cfg_attr(not(target_env = "msvc"), feature(libc))]