linker: Avoid library duplication with /WHOLEARCHIVE

petrochenkov · petrochenkov · commit fb9feb35eda2 · 2021-05-06T21:22:25.000+03:00
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs
@@ -813,11 +813,9 @@ impl<'a> Linker for MsvcLinker<'a> {
     }
 
     fn link_whole_staticlib(&mut self, lib: Symbol, verbatim: bool, _search_path: &[PathBuf]) {
-        self.link_staticlib(lib, verbatim);
         self.cmd.arg(format!("/WHOLEARCHIVE:{}{}", lib, if verbatim { "" } else { ".lib" }));
     }
     fn link_whole_rlib(&mut self, path: &Path) {
-        self.link_rlib(path);
         let mut arg = OsString::from("/WHOLEARCHIVE:");
         arg.push(path);
         self.cmd.arg(arg);

Original file line number	Diff line number	Diff line change
`@@ -813,11 +813,9 @@ impl<'a> Linker for MsvcLinker<'a> {`
`813`	`813`	`}`
`814`	`814`
`815`	`815`	`fn link_whole_staticlib(&mut self, lib: Symbol, verbatim: bool, _search_path: &[PathBuf]) {`
`816`		`- self.link_staticlib(lib, verbatim);`
`817`	`816`	`self.cmd.arg(format!("/WHOLEARCHIVE:{}{}", lib, if verbatim { "" } else { ".lib" }));`
`818`	`817`	`}`
`819`	`818`	`fn link_whole_rlib(&mut self, path: &Path) {`
`820`		`- self.link_rlib(path);`
`821`	`819`	`let mut arg = OsString::from("/WHOLEARCHIVE:");`
`822`	`820`	`arg.push(path);`
`823`	`821`	`self.cmd.arg(arg);`