diff options
| author | Jorge Aparicio <jorge@japaric.io> | 2018-08-19 23:59:20 +0200 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io> | 2018-08-19 23:59:20 +0200 |
| commit | a6f4ae864eb9a99117f7475325bf9ffb2c8e8b90 (patch) | |
| tree | 676c5014e9e9fd9d17adaa5641135f05f5033229 /src/librustc_codegen_llvm/back | |
| parent | 98e4cd50f9908dcf2330196baa756a775343e47d (diff) | |
| download | rust-a6f4ae864eb9a99117f7475325bf9ffb2c8e8b90.tar.gz rust-a6f4ae864eb9a99117f7475325bf9ffb2c8e8b90.zip | |
fix: preserve msvc linker fallback logic
Diffstat (limited to 'src/librustc_codegen_llvm/back')
| -rw-r--r-- | src/librustc_codegen_llvm/back/link.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/back/link.rs b/src/librustc_codegen_llvm/back/link.rs index afbcaf4c659..91515d1c85b 100644 --- a/src/librustc_codegen_llvm/back/link.rs +++ b/src/librustc_codegen_llvm/back/link.rs @@ -75,7 +75,9 @@ pub fn get_linker(sess: &Session, linker: &Path, flavor: LinkerFlavor) -> (PathB 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), |