mirror of https://github.com/rust-lang/rust.git
Don't pass local_crate_name to link_binary separately
It is already part of CodegenResults
This commit is contained in:
parent
5aaa953dcc
commit
56ee9864c1
|
@ -219,7 +219,6 @@ impl CodegenBackend for CraneliftCodegenBackend {
|
|||
sess,
|
||||
&codegen_results,
|
||||
outputs,
|
||||
&codegen_results.crate_info.local_crate_name.as_str(),
|
||||
);
|
||||
|
||||
Ok(())
|
||||
|
|
|
@ -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(())
|
||||
}
|
||||
|
|
|
@ -54,7 +54,6 @@ pub fn link_binary<'a, B: ArchiveBuilder<'a>>(
|
|||
sess: &'a Session,
|
||||
codegen_results: &CodegenResults,
|
||||
outputs: &OutputFilenames,
|
||||
crate_name: &str,
|
||||
) {
|
||||
let _timer = sess.timer("link_binary");
|
||||
let output_metadata = sess.opts.output_types.contains_key(&OutputType::Metadata);
|
||||
|
@ -87,7 +86,12 @@ pub fn link_binary<'a, B: ArchiveBuilder<'a>>(
|
|||
.tempdir()
|
||||
.unwrap_or_else(|err| sess.fatal(&format!("couldn't create a temp dir: {}", err)));
|
||||
let path = MaybeTempDir::new(tmpdir, sess.opts.cg.save_temps);
|
||||
let out_filename = out_filename(sess, crate_type, outputs, crate_name);
|
||||
let out_filename = out_filename(
|
||||
sess,
|
||||
crate_type,
|
||||
outputs,
|
||||
&codegen_results.crate_info.local_crate_name.as_str(),
|
||||
);
|
||||
match crate_type {
|
||||
CrateType::Rlib => {
|
||||
let _timer = sess.timer("link_rlib");
|
||||
|
|
Loading…
Reference in New Issue