diff --git a/Makefile b/Makefile
index 712e63745..a303013d8 100644
--- a/Makefile
+++ b/Makefile
@@ -52,12 +52,20 @@ build/llvm.BUILT:
 	touch build/llvm.BUILT
 
 build/wasi-libc.BUILT: build/llvm.BUILT
-	$(MAKE) -C $(ROOT_DIR)/src/wasi-libc \
-		WASM_CC=$(PREFIX)/bin/clang \
-		SYSROOT=$(PREFIX)/share/wasi-sysroot
+	mkdir -p build/wasi-libc
+	cd build/wasi-libc; cmake -G Ninja \
+		-DCMAKE_SYSTEM_NAME=Generic \
+		-DCMAKE_AR=$(PREFIX)/bin/ar \
+		-DCMAKE_NM=$(PREFIX)/bin/nm \
+		-DCMAKE_C_COMPILER=$(PREFIX)/bin/clang \
+		-DCMAKE_C_COMPILER_WORKS=YES \
+		$(ROOT_DIR)/src/wasi-libc
+	ninja $(NINJA_FLAGS) -v -C build/wasi-libc
+	mkdir -p $(PREFIX)/share
+	cp -R build/wasi-libc/sysroot $(PREFIX)/share/wasi-sysroot
 	touch build/wasi-libc.BUILT
 
-build/compiler-rt.BUILT: build/llvm.BUILT
+build/compiler-rt.BUILT: build/wasi-libc.BUILT build/llvm.BUILT
 	mkdir -p build/compiler-rt
 	cd build/compiler-rt; cmake -G Ninja \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
diff --git a/src/wasi-libc b/src/wasi-libc
index f645f498d..d68f3d385 160000
--- a/src/wasi-libc
+++ b/src/wasi-libc
@@ -1 +1 @@
-Subproject commit f645f498dfbbbc00a7a97874d33082d3605c3f21
+Subproject commit d68f3d385c442b9fbc50ffe018cc89b349cc5193