diff options
| author | bors <bors@rust-lang.org> | 2021-07-06 22:20:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-06 22:20:43 +0000 |
| commit | b20e3ff2af39e1de6280d52aea2e87585e98056d (patch) | |
| tree | 475f9dc55c47e934a81eb86820a7f63483faf197 /compiler/rustc_codegen_llvm/src | |
| parent | 885399992c4c1dde37b506b8507a7d69415646b9 (diff) | |
| parent | 25e45baf55280eb310cfb182024194c69347c890 (diff) | |
| download | rust-b20e3ff2af39e1de6280d52aea2e87585e98056d.tar.gz rust-b20e3ff2af39e1de6280d52aea2e87585e98056d.zip | |
Auto merge of #86911 - bjorn3:crate_info_refactor, r=petrochenkov
Refactor linker code This merges `LinkerInfo` into `CrateInfo` as there is no reason to keep them separate. `LinkerInfo::to_linker` is merged into `get_linker` as both have different logic for each linker type and `to_linker` is directly called after `get_linker`. Also contains a couple of small cleanups. See the individual commits for all changes.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/lib.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs index fc890f23853..26fd1cfbcd0 100644 --- a/compiler/rustc_codegen_llvm/src/lib.rs +++ b/compiler/rustc_codegen_llvm/src/lib.rs @@ -292,12 +292,7 @@ impl CodegenBackend for LlvmCodegenBackend { // Run the linker on any artifacts that resulted from the LLVM run. // This should produce either a finished executable or library. - link_binary::<LlvmArchiveBuilder<'_>>( - sess, - &codegen_results, - outputs, - &codegen_results.crate_info.local_crate_name.as_str(), - ); + link_binary::<LlvmArchiveBuilder<'_>>(sess, &codegen_results, outputs); Ok(()) } |
