commit a6f4ae864eb9a99117f7475325bf9ffb2c8e8b90
author Jorge Aparicio <jorge@japaric.io> Sun Aug 19 23:59:20 2018 +0200
committer Jorge Aparicio <jorge@japaric.io> Sun Aug 19 23:59:20 2018 +0200
tree 676c5014e9e9fd9d17adaa5641135f05f5033229
parent 98e4cd50f9908dcf2330196baa756a775343e47d

fix: preserve msvc linker fallback logic

src/librustc_codegen_llvm/back/link.rs

diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs
index afbcaf4..91515d1 100644
--- a/src/librustc_codegen_llvm/back/link.rs
+++ b/src/librustc_codegen_llvm/back/link.rs
@@ -75,7 +75,9 @@
         Some(linker) if cfg!(windows) && linker.ends_with(".bat") => Command::bat_script(linker),
         _ => match flavor {
             LinkerFlavor::Lld(f) => Command::lld(linker, f),
-            LinkerFlavor::Msvc => {
+            LinkerFlavor::Msvc
+                if sess.opts.cg.linker.is_none() && sess.target.target.options.linker.is_none() =>
+            {
                 Command::new(msvc_tool.as_ref().map(|t| t.path()).unwrap_or(linker))
             },
             _ => Command::new(linker),