From d42b28af4178654f5bb6984b156eaee88d298746 Mon Sep 17 00:00:00 2001
From: Amos Wenger <amoswenger@gmail.com>
Date: Fri, 22 Jul 2022 18:01:49 +0200
Subject: [PATCH] Allow cross-compiling, build all crates

---
 src/bootstrap/tool.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 5743548d969..9d465a312f9 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -692,7 +692,7 @@ pub struct RustAnalyzer {
 impl Step for RustAnalyzer {
     type Output = Option<PathBuf>;
     const DEFAULT: bool = true;
-    const ONLY_HOSTS: bool = true;
+    const ONLY_HOSTS: bool = false;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
         let builder = run.builder;
@@ -719,8 +719,8 @@ impl Step for RustAnalyzer {
             target: self.target,
             tool: "rust-analyzer",
             mode: Mode::ToolStd,
-            path: "src/tools/rust-analyzer/crates/rust-analyzer",
-            extra_features: vec!["in-rust-tree".to_owned()],
+            path: "src/tools/rust-analyzer",
+            extra_features: vec!["rust-analyzer/in-rust-tree".to_owned()],
             is_optional_tool: true,
             source_type: SourceType::InTree,
         })