diff --git a/cmake/wasi-sdk-sysroot.cmake b/cmake/wasi-sdk-sysroot.cmake
index e1e26ca41..5bd04bb36 100644
--- a/cmake/wasi-sdk-sysroot.cmake
+++ b/cmake/wasi-sdk-sysroot.cmake
@@ -174,6 +174,7 @@ function(define_wasi_libc_sub target target_suffix lto)
       -DBUILTINS_LIB=${libcompiler_rt_a}
       -DUSE_WASM_COMPONENT_LD=OFF
       -DBINDINGS_TARGET=OFF
+      -DWASI_SDK_VERSION=${wasi_sdk_version}
     DEPENDS compiler-rt
     EXCLUDE_FROM_ALL ON
     USES_TERMINAL_CONFIGURE ON
diff --git a/src/wasi-libc b/src/wasi-libc
index 06bef3c91..6036a9f3e 160000
--- a/src/wasi-libc
+++ b/src/wasi-libc
@@ -1 +1 @@
-Subproject commit 06bef3c91a541b67edf88ff44e0e3bc0a928ad16
+Subproject commit 6036a9f3e349315faba2732a32508d5dc9d6d928