File tree Expand file tree Collapse file tree 2 files changed +3
-8
lines changed
compiler/rustc_codegen_ssa/src/back Expand file tree Collapse file tree 2 files changed +3
-8
lines changed Original file line number Diff line number Diff line change @@ -1021,12 +1021,8 @@ fn link_natively(
10211021 && ( code < 1000 || code > 9999 )
10221022 {
10231023 let is_vs_installed = windows_registry:: find_vs_version ( ) . is_ok ( ) ;
1024- // FIXME(cc-rs#1265) pass only target arch to find_tool()
1025- let has_linker = windows_registry:: find_tool (
1026- sess. opts . target_triple . tuple ( ) ,
1027- "link.exe" ,
1028- )
1029- . is_some ( ) ;
1024+ let has_linker =
1025+ windows_registry:: find_tool ( & sess. target . arch , "link.exe" ) . is_some ( ) ;
10301026
10311027 sess. dcx ( ) . emit_note ( errors:: LinkExeUnexpectedError ) ;
10321028 if is_vs_installed && has_linker {
Original file line number Diff line number Diff line change @@ -50,8 +50,7 @@ pub(crate) fn get_linker<'a>(
5050 self_contained : bool ,
5151 target_cpu : & ' a str ,
5252) -> Box < dyn Linker + ' a > {
53- // FIXME(cc-rs#1265) pass only target arch to find_tool()
54- let msvc_tool = windows_registry:: find_tool ( sess. opts . target_triple . tuple ( ) , "link.exe" ) ;
53+ let msvc_tool = windows_registry:: find_tool ( & sess. target . arch , "link.exe" ) ;
5554
5655 // If our linker looks like a batch script on Windows then to execute this
5756 // we'll need to spawn `cmd` explicitly. This is primarily done to handle
You can’t perform that action at this time.
0 commit comments