about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2019-06-11 14:21:03 -0700
committerTyler Mandry <tmandry@gmail.com>2019-06-11 14:27:37 -0700
commit4f3cd3ca07f9583d503ad9b260a8d397ebf10055 (patch)
treed39028c19b3a840bc5e613b18a3e6591bed8020e /src/bootstrap
parent02564de47b40e953b5144dfd37450c16a84672f1 (diff)
downloadrust-4f3cd3ca07f9583d503ad9b260a8d397ebf10055.tar.gz
rust-4f3cd3ca07f9583d503ad9b260a8d397ebf10055.zip
Fix x.py install
Make sure we look for save analysis in the right place. Fixes #61703.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/install.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index 0047be4d595..557586709c6 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);