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 @@ -570,6 +570,13 @@ impl Step for Rustc {
570570 & self_contained_wild_dst_dir. join ( & exe_name) ,
571571 FileType :: Executable ,
572572 ) ;
573+ // Pretend Wild is LD so the compiler can pick it up
574+ let exe_name = exe ( "ld" , target_compiler. host ) ;
575+ builder. copy_link (
576+ & self_contained_wild_src_dir. join ( & exe_name) ,
577+ & self_contained_wild_dst_dir. join ( & exe_name) ,
578+ FileType :: Executable ,
579+ ) ;
573580 }
574581
575582 if builder. config . llvm_enabled ( target_compiler. host )
Original file line number Diff line number Diff line change @@ -1034,13 +1034,21 @@ pub(crate) fn copy_wild_artifacts(
10341034 let libdir_bin = builder. sysroot_target_bindir ( target_compiler, target) ;
10351035 t ! ( fs:: create_dir_all( & libdir_bin) ) ;
10361036
1037+ let dst_exe = exe ( "rust-wild" , target) ;
1038+
1039+ // This seems wrong
1040+ builder. copy_link (
1041+ & wild_wrapper. tool . tool_path ,
1042+ & libdir_bin. join ( dst_exe) ,
1043+ FileType :: Executable ,
1044+ ) ;
1045+
10371046 let self_contained_wild_dir = libdir_bin. join ( "wild-gcc-ld" ) ;
10381047 t ! ( fs:: create_dir_all( & self_contained_wild_dir) ) ;
10391048
1040- let wild_name = "wild" ;
10411049 builder. copy_link (
10421050 & wild_wrapper. tool . tool_path ,
1043- & self_contained_wild_dir. join ( exe ( wild_name , target) ) ,
1051+ & self_contained_wild_dir. join ( exe ( "wild" , target) ) ,
10441052 FileType :: Executable ,
10451053 ) ;
10461054 // Pretend it's `ld` binary so GCC picks it
You can’t perform that action at this time.
0 commit comments