File tree Expand file tree Collapse file tree 1 file changed +10
-2
lines changed
compiler/rustc_codegen_ssa/src/back Expand file tree Collapse file tree 1 file changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -1771,8 +1771,16 @@ fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
17711771
17721772// Returns true if linker is located within sysroot
17731773fn detect_self_contained_mingw ( sess : & Session ) -> bool {
1774- let linker = if let Some ( linker) = & sess. target . linker {
1775- Path :: new ( linker. as_ref ( ) )
1774+ // FIXME: this sort of duplicates `infer_from()` inside `linker_and_flavor()`
1775+ let path_buf = sess
1776+ . opts
1777+ . cg
1778+ . linker
1779+ . as_ref ( )
1780+ . map ( |l| l. as_path ( ) )
1781+ . or_else ( || sess. target . linker . as_ref ( ) . map ( |linker| Path :: new ( linker. as_ref ( ) ) ) ) ;
1782+ let linker = if let Some ( linker) = path_buf {
1783+ linker
17761784 } else {
17771785 return false ;
17781786 } ;
You can’t perform that action at this time.
0 commit comments