2 files changed, 18 insertions, 7 deletions

diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs
index 2002d3e2a..3255eefb9 100644
--- a/xtask/src/dist.rs
+++ b/xtask/src/dist.rs
@@ -7,13 +7,18 @@ use crate::{
     project_root,
 };
 
-pub fn run_dist(version: &str, release_tag: &str) -> Result<()> {
+pub struct ClientOpts {
+    pub version: String,
+    pub release_tag: String,
+}
+
+pub fn run_dist(client_opts: Option<ClientOpts>) -> Result<()> {
     let dist = project_root().join("dist");
     rm_rf(&dist)?;
     fs2::create_dir_all(&dist)?;
 
-    if cfg!(target_os = "linux") {
-        dist_client(version, release_tag)?;
+    if let Some(ClientOpts { version, release_tag }) = client_opts {
+        dist_client(&version, &release_tag)?;
     }
     dist_server()?;
     Ok(())
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index aafa73610..a9adcfba4 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -13,7 +13,7 @@ use std::env;
 use pico_args::Arguments;
 use xtask::{
     codegen::{self, Mode},
-    dist::run_dist,
+    dist::{run_dist, ClientOpts},
     install::{ClientOpt, InstallCmd, ServerOpt},
     not_bash::pushd,
     pre_commit, project_root, run_clippy, run_fuzzer, run_pre_cache, run_release, run_rustfmt,
@@ -103,10 +103,16 @@ FLAGS:
             run_release(dry_run)
         }
         "dist" => {
-            let version: String = args.value_from_str("--version")?;
-            let release_tag: String = args.value_from_str("--tag")?;
+            let client_opts = if args.contains("--client") {
+                Some(ClientOpts {
+                    version: args.value_from_str("--version")?,
+                    release_tag: args.value_from_str("--tag")?,
+                })
+            } else {
+                None
+            };
             args.finish()?;
-            run_dist(&version, &release_tag)
+            run_dist(client_opts)
         }
         _ => {
             eprintln!(