Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remote server: Use env flag to opt out of musl remote server build (#36069)

Browse source 
Closes #ISSUE

This will allow devs to opt out of the musl build when developing zed by
running `ZED_BUILD_REMOTE_SERVER=nomusl cargo r` which also fixes remote
builds on NixOS.

Release Notes:

- Add a env flag (`ZED_BUILD_REMOTE_SERVER=nomusl`) to opt out of musl
builds when building the remote server
This commit is contained in:
Alvaro Parker 2025-08-14 22:31:01 -04:00 • committed by GitHub
parent 8366b6ce54
commit 4d27b228f7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/remote/src/ssh_session.rs
View file

@ -2069,11 +2069,17 @@ impl SshRemoteConnection {
Ok(()) Ok(())
} }
let use_musl = !build_remote_server.contains("nomusl");
let triple = format!( let triple = format!(
"{}-{}", "{}-{}",
self.ssh_platform.arch, self.ssh_platform.arch,
match self.ssh_platform.os { match self.ssh_platform.os {
"linux" => "unknown-linux-musl", "linux" =>
if use_musl {
"unknown-linux-musl"
} else {
"unknown-linux-gnu"
},
"macos" => "apple-darwin", "macos" => "apple-darwin",
_ => anyhow::bail!("can't cross compile for: {:?}", self.ssh_platform), _ => anyhow::bail!("can't cross compile for: {:?}", self.ssh_platform),
} }
@ -2086,7 +2092,7 @@ impl SshRemoteConnection {
String::new() String::new()
} }
}; };
if self.ssh_platform.os == "linux" { if self.ssh_platform.os == "linux" && use_musl {
rust_flags.push_str(" -C target-feature=+crt-static"); rust_flags.push_str(" -C target-feature=+crt-static");
} }
if build_remote_server.contains("mold") { if build_remote_server.contains("mold") {