From a47fdb99c04fc9119247c6511033e30735490804 Mon Sep 17 00:00:00 2001 From: Victor Ding Date: Thu, 23 Jan 2020 21:48:48 +1100 Subject: Support linking from a .rlink file Flag `-Z no-link` was previously introduced, which allows creating an `.rlink` file to perform compilation without linking. This change enables linking from an `.rlink` file. --- src/librustc_codegen_llvm/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/librustc_codegen_llvm') diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index 8091a748540..e189bea4a09 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/src/librustc_codegen_llvm/lib.rs @@ -39,7 +39,7 @@ use syntax::expand::allocator::AllocatorKind; use rustc::dep_graph::DepGraph; use rustc::middle::cstore::{EncodedMetadata, MetadataLoaderDyn}; -use rustc::session::config::{OptLevel, OutputFilenames, PrintRequest}; +use rustc::session::config::{self, OptLevel, OutputFilenames, PrintRequest}; use rustc::session::Session; use rustc::ty::{self, TyCtxt}; use rustc::util::common::ErrorReported; @@ -308,7 +308,7 @@ impl CodegenBackend for LlvmCodegenBackend { let rlink_data = json::encode(&codegen_results).map_err(|err| { sess.fatal(&format!("failed to encode rlink: {}", err)); })?; - let rlink_file = outputs.with_extension("rlink"); + let rlink_file = outputs.with_extension(config::RLINK_EXT); fs::write(&rlink_file, rlink_data).map_err(|err| { sess.fatal(&format!("failed to write file {}: {}", rlink_file.display(), err)); })?; -- cgit 1.4.1-3-g733a5