From 45aa4951eb8c7524d7d9b72af30d9fa25d66cf73 Mon Sep 17 00:00:00 2001
From: Wildan M <willnode@wellosoft.net>
Date: Fri, 13 Feb 2026 09:29:15 +0700
Subject: [PATCH] Use zstd for llvm

---
 recipes/dev/lld21/recipe.toml  | 7 +++++++
 recipes/dev/llvm21/recipe.toml | 5 ++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/recipes/dev/lld21/recipe.toml b/recipes/dev/lld21/recipe.toml
index 1fa2cf5ac..e15dc3275 100644
--- a/recipes/dev/lld21/recipe.toml
+++ b/recipes/dev/lld21/recipe.toml
@@ -45,6 +45,13 @@ COOKBOOK_CMAKE_FLAGS+=(
     -DUNIX=1
 )
 
+if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then
+# avoid linking as much as possible during bootstrapping
+    COOKBOOK_CMAKE_FLAGS+=(
+        -DLLVM_USE_STATIC_ZSTD=On
+    )
+fi
+
 COOKBOOK_SOURCE="$COOKBOOK_SOURCE/lld"
 
 cookbook_cmake
diff --git a/recipes/dev/llvm21/recipe.toml b/recipes/dev/llvm21/recipe.toml
index 784ed391d..041243edc 100644
--- a/recipes/dev/llvm21/recipe.toml
+++ b/recipes/dev/llvm21/recipe.toml
@@ -7,13 +7,12 @@ shallow_clone = true
 [build]
 template = "custom"
 dependencies = [
-    "zlib",
+    "zstd",
     "libxml2",
 ]
 dev-dependencies = [
     "host:xz",
     "host:libarchive",  # workaround for cmake error
-    "host:zstd"
 ]
 script = """
 DYNAMIC_INIT
@@ -40,6 +39,7 @@ COOKBOOK_CMAKE_FLAGS+=(
     -DLLVM_TOOL_LLVM_COV_BUILD=On
     -DLLVM_TOOL_LLVM_PROFDATA_BUILD=On
     -DLLVM_TARGETS_TO_BUILD="$LLVM_TARGETS_TO_BUILD"
+    -DLLVM_ENABLE_ZLIB=Off
 
 # the rest of options that shared to clang
     -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE=$(realpath "${COOKBOOK_RECIPE}/native.cmake")"
@@ -64,7 +64,6 @@ if [ "${COOKBOOK_HOST_SYSROOT}" = "/usr" ]; then
 # avoid linking as much as possible during bootstrapping
     COOKBOOK_CMAKE_FLAGS+=(
         -DLLVM_ENABLE_LIBXML2=Off
-        -DLLVM_ENABLE_ZLIB=Off
         -DLLVM_USE_STATIC_ZSTD=On
     )
 fi