From 0124341935787d1d6aa5eace209c9bb7968f35db Mon Sep 17 00:00:00 2001
From: David Wood <david@davidtw.co>
Date: Thu, 29 Nov 2018 20:40:43 +0100
Subject: [PATCH] Only consider stem when extension is exe.

This commit modifies linker flavor inference to only remove the extension
to the linker when performing inference if that extension is a 'exe'.
---
 src/librustc_codegen_ssa/back/link.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
index b0575b841d5d5..24a70dc797771 100644
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
@@ -161,7 +161,11 @@ pub fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
                 LinkerFlavor::Lld(_) => "lld",
             }), flavor)),
             (Some(linker), None) => {
-                let stem = linker.file_stem().and_then(|stem| stem.to_str()).unwrap_or_else(|| {
+                let stem = if linker.extension().and_then(|ext| ext.to_str()) == Some("exe") {
+                    linker.file_stem().and_then(|stem| stem.to_str())
+                } else {
+                    linker.to_str()
+                }.unwrap_or_else(|| {
                     sess.fatal("couldn't extract file stem from specified linker");
                 }).to_owned();