Skip to content

Commit

Permalink
Rollup merge of rust-lang#61750 - tmandry:fix-install, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Centril committed Jun 12, 2019
2 parents 0d8d08d + 4f3cd3c commit 4cbae09
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/bootstrap/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,10 @@ install!((self, builder, _config),
};
Analysis, "analysis", Self::should_build(_config), only_hosts: false, {
builder.ensure(dist::Analysis {
compiler: self.compiler,
// Find the actual compiler (handling the full bootstrap option) which
// produced the save-analysis data because that data isn't copied
// through the sysroot uplifting.
compiler: builder.compiler_for(builder.top_stage, builder.config.build, self.target),
target: self.target
});
install_analysis(builder, self.compiler.stage, self.target);
Expand Down

0 comments on commit 4cbae09

Please sign in to comment.