diff options
| author | Tim Neumann <mail@timnn.me> | 2017-04-13 22:27:53 +0200 |
|---|---|---|
| committer | Tim Neumann <mail@timnn.me> | 2017-04-23 22:00:03 +0200 |
| commit | 899427765760068163c811fbe9e02ff953638698 (patch) | |
| tree | 42b83cc32a68aac6ca69840193bfcb9a58e9a364 | |
| parent | f3dda17469bd70feaf6a1d979cdc65dd450f8fcb (diff) | |
| download | rust-899427765760068163c811fbe9e02ff953638698.tar.gz rust-899427765760068163c811fbe9e02ff953638698.zip | |
FIN: windows-gnu: statically link gcc_s, pthread with llvm
| -rw-r--r-- | src/librustc_llvm/build.rs | 4 | ||||
| -rw-r--r-- | src/librustc_llvm/lib.rs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs index 7d5887e699f..7ef9031734a 100644 --- a/src/librustc_llvm/build.rs +++ b/src/librustc_llvm/build.rs @@ -265,4 +265,8 @@ fn main() { if target.contains("windows") { println!("cargo:rustc-link-lib=ole32"); } + if target.contains("windows-gnu") { + println!("cargo:rustc-link-lib=static-nobundle=gcc_s"); + println!("cargo:rustc-link-lib=static-nobundle=pthread"); + } } diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs index f300bf16145..7c52ceae459 100644 --- a/src/librustc_llvm/lib.rs +++ b/src/librustc_llvm/lib.rs @@ -29,6 +29,7 @@ #![feature(link_args)] #![feature(staged_api)] #![feature(rustc_private)] +#![feature(static_nobundle)] extern crate libc; #[macro_use] |