Skip to content

Commit 56ee986

Browse files
committed
Don't pass local_crate_name to link_binary separately
It is already part of CodegenResults
1 parent 5aaa953 commit 56ee986

File tree

3 files changed

+7
-9
lines changed
  • compiler

3 files changed

+7
-9
lines changed

compiler/rustc_codegen_cranelift/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ impl CodegenBackend for CraneliftCodegenBackend {
219219
sess,
220220
&codegen_results,
221221
outputs,
222-
&codegen_results.crate_info.local_crate_name.as_str(),
223222
);
224223

225224
Ok(())

compiler/rustc_codegen_llvm/src/lib.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,12 +292,7 @@ impl CodegenBackend for LlvmCodegenBackend {
292292

293293
// Run the linker on any artifacts that resulted from the LLVM run.
294294
// This should produce either a finished executable or library.
295-
link_binary::<LlvmArchiveBuilder<'_>>(
296-
sess,
297-
&codegen_results,
298-
outputs,
299-
&codegen_results.crate_info.local_crate_name.as_str(),
300-
);
295+
link_binary::<LlvmArchiveBuilder<'_>>(sess, &codegen_results, outputs);
301296

302297
Ok(())
303298
}

compiler/rustc_codegen_ssa/src/back/link.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ pub fn link_binary<'a, B: ArchiveBuilder<'a>>(
5454
sess: &'a Session,
5555
codegen_results: &CodegenResults,
5656
outputs: &OutputFilenames,
57-
crate_name: &str,
5857
) {
5958
let _timer = sess.timer("link_binary");
6059
let output_metadata = sess.opts.output_types.contains_key(&OutputType::Metadata);
@@ -87,7 +86,12 @@ pub fn link_binary<'a, B: ArchiveBuilder<'a>>(
8786
.tempdir()
8887
.unwrap_or_else(|err| sess.fatal(&format!("couldn't create a temp dir: {}", err)));
8988
let path = MaybeTempDir::new(tmpdir, sess.opts.cg.save_temps);
90-
let out_filename = out_filename(sess, crate_type, outputs, crate_name);
89+
let out_filename = out_filename(
90+
sess,
91+
crate_type,
92+
outputs,
93+
&codegen_results.crate_info.local_crate_name.as_str(),
94+
);
9195
match crate_type {
9296
CrateType::Rlib => {
9397
let _timer = sess.timer("link_rlib");

0 commit comments

Comments
 (0)