From 0452f00514c202a81267ddd03503a442bcee7793 Mon Sep 17 00:00:00 2001
From: Sy Brand <sy.brand@fastly.com>
Date: Tue, 3 Mar 2026 13:46:14 +0000
Subject: [PATCH] Updates

---
 cmake/wasi-sdk-sysroot.cmake   |  2 +-
 cmake/wasi-sdk-toolchain.cmake | 42 ++++++++++------------------------
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/cmake/wasi-sdk-sysroot.cmake b/cmake/wasi-sdk-sysroot.cmake
index 86e7d6d..b3dd5c6 100644
--- a/cmake/wasi-sdk-sysroot.cmake
+++ b/cmake/wasi-sdk-sysroot.cmake
@@ -323,7 +323,7 @@ function(define_libcxx target)
 endfunction()
 
 foreach(target IN LISTS WASI_SDK_TARGETS)
-  #define_libcxx(${target})
+  define_libcxx(${target})
 endforeach()
 
 # =============================================================================
diff --git a/cmake/wasi-sdk-toolchain.cmake b/cmake/wasi-sdk-toolchain.cmake
index 9b7be4d..1d9e8b6 100644
--- a/cmake/wasi-sdk-toolchain.cmake
+++ b/cmake/wasi-sdk-toolchain.cmake
@@ -82,8 +82,8 @@ ExternalProject_Add(llvm-build
     -DLLVM_ENABLE_ZLIB=OFF
     -DLLVM_ENABLE_ZSTD=OFF
     -DLLVM_STATIC_LINK_CXX_STDLIB=ON
-    -DLLVM_INCLUDE_TESTS=ON
-    -DLLVM_INCLUDE_UTILS=ON
+    -DLLVM_INCLUDE_TESTS=OFF
+    -DLLVM_INCLUDE_UTILS=OFF
     -DLLVM_INCLUDE_BENCHMARKS=OFF
     -DLLVM_INCLUDE_EXAMPLES=OFF
     -DLLVM_TARGETS_TO_BUILD=WebAssembly
@@ -124,34 +124,16 @@ if(RUST_TARGET)
   set(rust_target_flag --target=${RUST_TARGET})
 endif()
 
-# Option to use local wasm-component-ld source instead of cargo install
-set(WASM_COMPONENT_LD_SOURCE "" CACHE PATH "Path to wasm-component-ld source directory")
-
-if(WASM_COMPONENT_LD_SOURCE)
-  # Build from local source
-  add_custom_command(
-    OUTPUT ${wasm_component_ld}
-    COMMAND
-      cargo install --root ${wasm_component_ld_root} ${rust_target_flag}
-        --path ${WASM_COMPONENT_LD_SOURCE}
-    COMMAND
-      cmake -E make_directory ${wasi_tmp_install}/bin
-    COMMAND
-      cmake -E copy ${wasm_component_ld} ${wasi_tmp_install}/bin
-    COMMENT "Building `wasm-component-ld` from ${WASM_COMPONENT_LD_SOURCE}...")
-else()
-  # Install from crates.io
-  add_custom_command(
-    OUTPUT ${wasm_component_ld}
-    COMMAND
-      cargo install --root ${wasm_component_ld_root} ${rust_target_flag}
-        wasm-component-ld@${wasm_component_ld_version}
-    COMMAND
-      cmake -E make_directory ${wasi_tmp_install}/bin
-    COMMAND
-      cmake -E copy ${wasm_component_ld} ${wasi_tmp_install}/bin
-    COMMENT "Building `wasm-component-ld` ...")
-endif()
+add_custom_command(
+  OUTPUT ${wasm_component_ld}
+  COMMAND
+    cargo install --root ${wasm_component_ld_root} ${rust_target_flag}
+      wasm-component-ld@${wasm_component_ld_version}
+  COMMAND
+    cmake -E make_directory ${wasi_tmp_install}/bin
+  COMMAND
+    cmake -E copy ${wasm_component_ld} ${wasi_tmp_install}/bin
+  COMMENT "Building `wasm-component-ld` ...")
 add_custom_target(wasm-component-ld DEPENDS ${wasm_component_ld})
 add_dependencies(build wasm-component-ld)