Fix weird implicit dependency between rustllvm and rustc_codegen_llvm

[rust.git] / src / librustc_llvm / build.rs

diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
index 62a3757757b800f9ca77d60cdbe1ed62d7aba071..c5d5f066f4f821d156aded803472942de655a88c 100644 (file)
--- a/src/librustc_llvm/build.rs
+++ b/src/librustc_llvm/build.rs
@@ -279,7 +279,11 @@ fn main() {
             let path = PathBuf::from(s);
             println!("cargo:rustc-link-search=native={}",
                      path.parent().unwrap().display());
-            println!("cargo:rustc-link-lib=static={}", stdcppname);
+            if target.contains("windows") {
+                println!("cargo:rustc-link-lib=static-nobundle={}", stdcppname);
+            } else {
+                println!("cargo:rustc-link-lib=static={}", stdcppname);
+            }
         } else if cxxflags.contains("stdlib=libc++") {
             println!("cargo:rustc-link-lib=c++");
         } else {