File tree Expand file tree Collapse file tree 2 files changed +17
-2
lines changed
src/bootstrap/src/core/build_steps Expand file tree Collapse file tree 2 files changed +17
-2
lines changed Original file line number Diff line number Diff line change @@ -569,6 +569,13 @@ impl Step for Rustc {
569569 & self_contained_wild_dst_dir. join ( & exe_name) ,
570570 FileType :: Executable ,
571571 ) ;
572+ // Pretend Wild is LD so the compiler can pick it up
573+ let exe_name = exe ( "ld" , target_compiler. host ) ;
574+ builder. copy_link (
575+ & self_contained_wild_src_dir. join ( & exe_name) ,
576+ & self_contained_wild_dst_dir. join ( & exe_name) ,
577+ FileType :: Executable ,
578+ ) ;
572579 }
573580
574581 if builder. config . llvm_enabled ( target_compiler. host )
Original file line number Diff line number Diff line change @@ -1028,13 +1028,21 @@ pub(crate) fn copy_wild_artifacts(
10281028 let libdir_bin = builder. sysroot_target_bindir ( target_compiler, target) ;
10291029 t ! ( fs:: create_dir_all( & libdir_bin) ) ;
10301030
1031+ let dst_exe = exe ( "rust-wild" , target) ;
1032+
1033+ // This seems wrong
1034+ builder. copy_link (
1035+ & wild_wrapper. tool . tool_path ,
1036+ & libdir_bin. join ( dst_exe) ,
1037+ FileType :: Executable ,
1038+ ) ;
1039+
10311040 let self_contained_wild_dir = libdir_bin. join ( "wild-gcc-ld" ) ;
10321041 t ! ( fs:: create_dir_all( & self_contained_wild_dir) ) ;
10331042
1034- let wild_name = "wild" ;
10351043 builder. copy_link (
10361044 & wild_wrapper. tool . tool_path ,
1037- & self_contained_wild_dir. join ( exe ( wild_name , target) ) ,
1045+ & self_contained_wild_dir. join ( exe ( "wild" , target) ) ,
10381046 FileType :: Executable ,
10391047 ) ;
10401048 // Pretend it's `ld` binary so GCC picks it
You can’t perform that action at this time.
0 commit comments