From e87d5e145d897083630c403272663a63dfc0ec8a Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Wed, 23 Oct 2024 22:19:06 +0300 Subject: [PATCH] Use zstd without dynamic linking due to musl usage (#19627) Due to leaning towards `musl` builds, unit features for `zstd` and link it statically too for Zed. https://github.com/gyscos/zstd-rs/blob/bfe1e34f593c2427e9dc35f1b98d06788174711f/zstd-safe/zstd-sys/build.rs#L260 shows that `ZSTD_SYS_USE_PKG_CONFIG` env var can be used to return this behavior. Release Notes: - N/A --- Cargo.lock | 1 - crates/zed/Cargo.toml | 2 -- 2 files changed, 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 845cdb227f954..207e34e49be44 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14709,7 +14709,6 @@ dependencies = [ "winresource", "workspace", "zed_actions", - "zstd", ] [[package]] diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index dda06ff7d2419..d80db98393d95 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -125,8 +125,6 @@ winresource = "0.1" [target.'cfg(target_os = "linux")'.dependencies] ashpd.workspace = true -# We don't use zstd in the zed crate, but we want to add this feature when compiling a desktop build of Zed -zstd = { workspace = true, features = [ "pkg-config" ] } [dev-dependencies] call = { workspace = true, features = ["test-support"] }