Auto merge of rust-lang#17634 - lnicola:fix-xtask-install, r=lnicola

minor: Make xtask install work again CC rust-lang/rust-analyzer#17559 (comment)
RalfJung · Jul 19, 2024 · e872d2f · e872d2f
2 parents 298ff04 + 6cb005f
commit e872d2f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/tools/rust-analyzer/xtask/src/flags.rs b/src/tools/rust-analyzer/xtask/src/flags.rs
@@ -289,7 +289,7 @@ impl Malloc {
 
 impl Install {
     pub(crate) fn server(&self) -> Option<ServerOpt> {
-        if !self.server {
+        if (self.client || self.proc_macro_server) && !self.server {
             return None;
         }
         let malloc = if self.mimalloc {
@@ -308,7 +308,7 @@ impl Install {
         Some(ProcMacroServerOpt { dev_rel: self.dev_rel })
     }
     pub(crate) fn client(&self) -> Option<ClientOpt> {
-        if !self.client {
+        if (self.server || self.proc_macro_server) && !self.client {
             return None;
         }
         Some(ClientOpt { code_bin: self.code_bin.clone() })