From 07493dd547ae220c321a2c9dcc7cf8602c8257b2 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Mon, 21 Feb 2022 21:34:55 -0500
Subject: [PATCH] Temporarily avoid errors on RLS failure in parallel

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

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 029049d543435..f5ae8103cb057 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1023,6 +1023,12 @@ impl Step for Rls {
         let rls = builder
             .ensure(tool::Rls { compiler, target, extra_features: Vec::new() })
             .or_else(|| {
+                if builder.config.rustc_parallel {
+                    // FIXME: Disable RLS on parallel builds, cannot build due
+                    // to upstream trouble. See
+                    // https://github.com/racer-rust/racer/pull/1177.
+                    return None;
+                }
                 missing_tool("RLS", builder.build.config.missing_tools);
                 None
             })?;