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

RalfJung · web-flow · commit 7cc45183cac5 · 2020-06-19T14:29:18.000+02:00
linker: MSVC supports linking static libraries as a whole archive
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

Original file line number	Diff line number	Diff line change
`@@ -721,12 +721,14 @@ impl<'a> Linker for MsvcLinker<'a> {`
`721`	`721`	`}`
`722`	`722`
`723`	`723`	`fn link_whole_staticlib(&mut self, lib: Symbol, _search_path: &[PathBuf]) {`
`724`		`- // not supported?`
`725`	`724`	`self.link_staticlib(lib);`
	`725`	`+ self.cmd.arg(format!("/WHOLEARCHIVE:{}.lib", lib));`
`726`	`726`	`}`
`727`	`727`	`fn link_whole_rlib(&mut self, path: &Path) {`
`728`		`- // not supported?`
`729`	`728`	`self.link_rlib(path);`
	`729`	`+ let mut arg = OsString::from("/WHOLEARCHIVE:");`
	`730`	`+ arg.push(path);`
	`731`	`+ self.cmd.arg(arg);`
`730`	`732`	`}`
`731`	`733`	`fn optimize(&mut self) {`
`732`	`734`	// Needs more investigation of `/OPT` arguments