From 4f3cd3ca07f9583d503ad9b260a8d397ebf10055 Mon Sep 17 00:00:00 2001
From: Tyler Mandry <tmandry@gmail.com>
Date: Tue, 11 Jun 2019 14:21:03 -0700
Subject: [PATCH] Fix x.py install
Make sure we look for save analysis in the right place. Fixes #61703.
---
src/bootstrap/install.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index 0047be4d5951b..557586709c612 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -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);