WIP

Author: Kobzol

src/bootstrap/src/core/build_steps/dist.rs

@@ -1228,15 +1228,20 @@ impl Step for RustAnalyzer {
     }
 
     fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
-        let compiler = self.compiler;
+        // let compiler = self.compiler;
         let target = self.target;
 
-        let rust_analyzer = builder.ensure(tool::RustAnalyzer { compiler, target });
+        let rust_analyzer = builder
+            .out
+            .join("x86_64-unknown-linux-gnu")
+            .join("stage1-tools-bin")
+            .join("rust-analyzer");
+        //builder.ensure(tool::RustAnalyzer { compiler, target });
 
         let mut tarball = Tarball::new(builder, "rust-analyzer", &target.triple);
         tarball.set_overlay(OverlayKind::RustAnalyzer);
         tarball.is_preview(true);
-        tarball.add_file(&rust_analyzer.tool_path, "bin", FileType::Executable);
+        tarball.add_file(&rust_analyzer, "bin", FileType::Executable);
         tarball.add_legal_and_readme_to("share/doc/rust-analyzer");
         Some(tarball.generate())
     }

src/tools/opt-dist/src/training.rs

@@ -111,9 +111,18 @@ pub fn rustc_benchmarks(env: &Environment) -> CmdBuilder {
 }
 
 pub fn rust_analyzer_benchmarks(env: &Environment, ra_bin: &Utf8Path) -> CmdBuilder {
+    let ld_library_path = std::env::var("LD_LIBRARY_PATH").unwrap_or_default();
+    let ld_library_path =
+        format!("{}:{ld_library_path}", env.build_artifacts().join("stage2").join("lib").as_str());
+
+    let path = std::env::var("PATH").unwrap_or_default();
+    let path = format!("{}:{path}", env.build_artifacts().join("stage0").join("bin").as_str());
+
     CmdBuilder::default()
         .arg(ra_bin)
         .arg("analysis-stats")
+        .env("LD_LIBRARY_PATH", &ld_library_path)
+        .env("PATH", &path)
         .arg(env.checkout_path().join("src").join("tools").join("rust-analyzer"))
         .arg("--run-all-ide-things")
 }