Rollup merge of #72785 - petrochenkov:wholemsvc, r=matthewjasper

linker: MSVC supports linking static libraries as a whole archive
rust-lang · Jun 19, 2020 · 7cc4518 · 7cc4518
2 parents 70622db + d1c275b
commit 7cc4518
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs
@@ -721,12 +721,14 @@ impl<'a> Linker for MsvcLinker<'a> {
     }
 
     fn link_whole_staticlib(&mut self, lib: Symbol, _search_path: &[PathBuf]) {
-        // not supported?
         self.link_staticlib(lib);
+        self.cmd.arg(format!("/WHOLEARCHIVE:{}.lib", lib));
     }
     fn link_whole_rlib(&mut self, path: &Path) {
-        // not supported?
         self.link_rlib(path);
+        let mut arg = OsString::from("/WHOLEARCHIVE:");
+        arg.push(path);
+        self.cmd.arg(arg);
     }
     fn optimize(&mut self) {
         // Needs more investigation of `/OPT` arguments