File tree 2 files changed +3
-6
lines changed
src/bootstrap/src/core/build_steps
2 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -1792,7 +1792,7 @@ impl Step for Assemble {
1792
1792
}
1793
1793
}
1794
1794
1795
- let maybe_install_llvm_bitcode_linker = |compiler| {
1795
+ let maybe_install_llvm_bitcode_linker = |compiler : Compiler | {
1796
1796
if builder. config . llvm_bitcode_linker_enabled {
1797
1797
let src_path = builder. ensure ( crate :: core:: build_steps:: tool:: LlvmBitcodeLinker {
1798
1798
compiler,
@@ -1974,7 +1974,7 @@ impl Step for Assemble {
1974
1974
) ;
1975
1975
}
1976
1976
1977
- maybe_install_llvm_bitcode_linker ( build_compiler ) ;
1977
+ maybe_install_llvm_bitcode_linker ( target_compiler ) ;
1978
1978
1979
1979
// Ensure that `libLLVM.so` ends up in the newly build compiler directory,
1980
1980
// so that it can be found when the newly built `rustc` is run.
Original file line number Diff line number Diff line change @@ -73,10 +73,7 @@ impl Step for ToolBuild {
73
73
fn run ( mut self , builder : & Builder < ' _ > ) -> PathBuf {
74
74
match self . mode {
75
75
Mode :: ToolRustc => {
76
- assert ! (
77
- self . compiler. stage > 0 ,
78
- "stage0 isn't supported for `Mode::ToolRustc` programs"
79
- ) ;
76
+ assert ! ( self . compiler. stage > 0 , "stage0 isn't supported for {}" , self . path) ;
80
77
// Similar to `compile::Assemble`, build with the previous stage's compiler. Otherwise
81
78
// we'd have stageN/bin/rustc and stageN/bin/$tool_name be effectively different stage
82
79
// compilers, which isn't what we want.
You can’t perform that action at this time.
0 commit comments