diff options
| author | bors <bors@rust-lang.org> | 2021-05-12 08:38:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-12 08:38:03 +0000 |
| commit | 809722dc134093c00e471e0c85876adeb3747d1e (patch) | |
| tree | 91ca2241ea3638fc15f2a1af8704640c30aff23a | |
| parent | 91dc6967fe5ebb8ff773a168e549482c18bb92d8 (diff) | |
| parent | 55dbf17bb57c1d05e0cb04c21e43ad3dc7b01858 (diff) | |
| download | rust-809722dc134093c00e471e0c85876adeb3747d1e.tar.gz rust-809722dc134093c00e471e0c85876adeb3747d1e.zip | |
Auto merge of #83610 - bjorn3:driver_cleanup, r=cjgillot
rustc_driver cleanup Best reviewed one commit at a time.
| -rw-r--r-- | src/driver/aot.rs | 2 | ||||
| -rw-r--r-- | src/lib.rs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/driver/aot.rs b/src/driver/aot.rs index 9c5cd53d866..e5f06551bb6 100644 --- a/src/driver/aot.rs +++ b/src/driver/aot.rs @@ -298,7 +298,7 @@ pub(crate) fn run_aot( metadata_module, metadata, windows_subsystem, - linker_info: LinkerInfo::new(tcx), + linker_info: LinkerInfo::new(tcx, crate::target_triple(tcx.sess).to_string()), crate_info: CrateInfo::new(tcx), }, work_products, diff --git a/src/lib.rs b/src/lib.rs index 32f40395702..4271f695f91 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -218,13 +218,11 @@ impl CodegenBackend for CraneliftCodegenBackend { ) -> Result<(), ErrorReported> { use rustc_codegen_ssa::back::link::link_binary; - let target_cpu = crate::target_triple(sess).to_string(); link_binary::<crate::archive::ArArchiveBuilder<'_>>( sess, &codegen_results, outputs, &codegen_results.crate_name.as_str(), - &target_cpu, ); Ok(()) |