From 0fc85a020aa39657bac1c576b03ad3be97687652 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Fri, 6 Jun 2025 13:58:13 -0400
Subject: [PATCH] Fix `script/build-linux` with newer GCC (#32029)

If you follow the [workaround advice in the
Docs](https://zed.dev/docs/development/linux#installing-a-development-build)
for building with a newer GCC, it will error:


https://github.com/zed-industries/zed/blob/79b1dd7db8baede7e5dbaa2ad077bca61d9bad49/script/bundle-linux#L88-L91

[Reported on
Discord](https://discord.com/channels/869392257814519848/1379093394105696288)

Release Notes:

- Fixed `script/build-linux` for non-musl builds.
---
 script/bundle-linux | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/script/bundle-linux b/script/bundle-linux
index e40eb33c93..9d0c5f83a1 100755
--- a/script/bundle-linux
+++ b/script/bundle-linux
@@ -87,7 +87,11 @@ fi
 
 # Ensure that remote_server does not depend on libssl nor libcrypto, as we got rid of these deps.
 if ldd "${target_dir}/${remote_server_triple}/release/remote_server" | grep -q 'libcrypto\|libssl'; then
-    echo "Error: remote_server still depends on libssl or libcrypto" && exit 1
+    if [[ "$remote_server_triple" == *-musl ]]; then
+        echo "Error: remote_server still depends on libssl or libcrypto" && exit 1
+    else
+        echo "Info: Using non-musl remote-server build."
+    fi
 fi
 
 suffix=""