linker: MSVC supports linking static libraries as a whole archive

petrochenkov · petrochenkov · commit d1c275b350f9 · 2020-05-30T18:54:59.000+03:00
diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs
@@ -704,12 +704,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
`@@ -704,12 +704,14 @@ impl<'a> Linker for MsvcLinker<'a> {`
`704`	`704`	`}`
`705`	`705`
`706`	`706`	`fn link_whole_staticlib(&mut self, lib: Symbol, _search_path: &[PathBuf]) {`
`707`		`- // not supported?`
`708`	`707`	`self.link_staticlib(lib);`
	`708`	`+ self.cmd.arg(format!("/WHOLEARCHIVE:{}.lib", lib));`
`709`	`709`	`}`
`710`	`710`	`fn link_whole_rlib(&mut self, path: &Path) {`
`711`		`- // not supported?`
`712`	`711`	`self.link_rlib(path);`
	`712`	`+ let mut arg = OsString::from("/WHOLEARCHIVE:");`
	`713`	`+ arg.push(path);`
	`714`	`+ self.cmd.arg(arg);`
`713`	`715`	`}`
`714`	`716`	`fn optimize(&mut self) {`
`715`	`717`	// Needs more investigation of `/OPT` arguments