Skip to content

Commit d61e2f2

Browse files
authored
Rollup merge of rust-lang#61750 - tmandry:fix-install, r=Mark-Simulacrum
Fix x.py install Make sure we look for save analysis in the right place. Fixes rust-lang#61703. r? @Mark-Simulacrum cc @petrhosek @cramertj
2 parents 474657c + 4f3cd3c commit d61e2f2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/bootstrap/install.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,10 @@ install!((self, builder, _config),
251251
};
252252
Analysis, "analysis", Self::should_build(_config), only_hosts: false, {
253253
builder.ensure(dist::Analysis {
254-
compiler: self.compiler,
254+
// Find the actual compiler (handling the full bootstrap option) which
255+
// produced the save-analysis data because that data isn't copied
256+
// through the sysroot uplifting.
257+
compiler: builder.compiler_for(builder.top_stage, builder.config.build, self.target),
255258
target: self.target
256259
});
257260
install_analysis(builder, self.compiler.stage, self.target);

0 commit comments

Comments
 (0)