about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-08-11 07:48:39 +0000
committerbors <bors@rust-lang.org>2015-08-11 07:48:39 +0000
commit23f43896ce92830173e503eab8b2f7fba8137e37 (patch)
tree0a61a110206a22fdb6f037bb1992486fbcbb4560 /src
parentf1ae605db8944f874994bab2879819f86f0250e2 (diff)
parent138252cc6a59420144b261a6537dcc2d95551981 (diff)
downloadrust-23f43896ce92830173e503eab8b2f7fba8137e37.tar.gz
rust-23f43896ce92830173e503eab8b2f7fba8137e37.zip
Auto merge of #27518 - alexcrichton:msvc-builtin-llvm-ar, r=huonw
This means that we no longer need to ship the `llvm-ar.exe` binary in the MSVC
distribution, and after a snapshot we can remove a good bit of logic from the
makefiles!
Diffstat (limited to 'src')
-rw-r--r--src/librustc_back/target/windows_msvc_base.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/librustc_back/target/windows_msvc_base.rs b/src/librustc_back/target/windows_msvc_base.rs
index bdc60cbc1ba..2466c254e05 100644
--- a/src/librustc_back/target/windows_msvc_base.rs
+++ b/src/librustc_back/target/windows_msvc_base.rs
@@ -59,6 +59,7 @@ pub fn opts() -> TargetOptions {
             "/NOLOGO".to_string(),
             "/NXCOMPAT".to_string(),
         ],
+        archive_format: "gnu".to_string(),
 
         .. Default::default()
     }