From 2835351feb1718892459b324c67680163a9569c9 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jsgf@fb.com>
Date: Sun, 16 May 2021 02:06:00 -0700
Subject: [PATCH] Use command line metadata path if provided

If the command-line has `--emit metadata=some/path/libfoo.rmeta` then
use that.

Closes #85356
---
 compiler/rustc_session/src/output.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compiler/rustc_session/src/output.rs b/compiler/rustc_session/src/output.rs
index 777eea3f68d..cc1e4bb198a 100644
--- a/compiler/rustc_session/src/output.rs
+++ b/compiler/rustc_session/src/output.rs
@@ -127,6 +127,11 @@ pub fn filename_for_metadata(
     crate_name: &str,
     outputs: &OutputFilenames,
 ) -> PathBuf {
+    // If the command-line specified the path, use that directly.
+    if let Some(Some(out_filename)) = sess.opts.output_types.get(&OutputType::Metadata) {
+        return out_filename.clone();
+    }
+
     let libname = format!("{}{}", crate_name, sess.opts.cg.extra_filename);
 
     let out_filename = outputs