File tree Expand file tree Collapse file tree 2 files changed +3
-6
lines changed
src/bootstrap/src/core/build_steps Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -1974,7 +1974,7 @@ impl Step for Assemble {
19741974 }
19751975 }
19761976
1977- let maybe_install_llvm_bitcode_linker = |compiler| {
1977+ let maybe_install_llvm_bitcode_linker = |compiler : Compiler | {
19781978 if builder. config . llvm_bitcode_linker_enabled {
19791979 trace ! ( "llvm-bitcode-linker enabled, installing" ) ;
19801980 let src_path = builder. ensure ( crate :: core:: build_steps:: tool:: LlvmBitcodeLinker {
@@ -2182,7 +2182,7 @@ impl Step for Assemble {
21822182 ) ;
21832183 }
21842184
2185- maybe_install_llvm_bitcode_linker ( build_compiler ) ;
2185+ maybe_install_llvm_bitcode_linker ( target_compiler ) ;
21862186
21872187 // Ensure that `libLLVM.so` ends up in the newly build compiler directory,
21882188 // so that it can be found when the newly built `rustc` is run.
Original file line number Diff line number Diff line change @@ -77,10 +77,7 @@ impl Step for ToolBuild {
7777 fn run ( mut self , builder : & Builder < ' _ > ) -> PathBuf {
7878 match self . mode {
7979 Mode :: ToolRustc => {
80- assert ! (
81- self . compiler. stage > 0 ,
82- "stage0 isn't supported for `Mode::ToolRustc` programs"
83- ) ;
80+ assert ! ( self . compiler. stage > 0 , "stage0 isn't supported for {}" , self . path) ;
8481 // Similar to `compile::Assemble`, build with the previous stage's compiler. Otherwise
8582 // we'd have stageN/bin/rustc and stageN/bin/$tool_name be effectively different stage
8683 // compilers, which isn't what we want.
You can’t perform that action at this time.
0 commit comments