diff --git a/interpreters/wamr/Kconfig b/interpreters/wamr/Kconfig
index e0c06a470..78dd60361 100644
--- a/interpreters/wamr/Kconfig
+++ b/interpreters/wamr/Kconfig
@@ -75,6 +75,11 @@ config INTERPRETERS_WAMR_LIBC_BUILTIN
 	bool "Enable built-in libc"
 	default n
 
+config INTERPRETERS_WAMR_BUILD_MODULES_FOR_NUTTX
+	bool "Build WASM modules for NuttX system interface (Experimental)"
+	default n
+	depends on INTERPRETERS_WAMR_LIBC_BUILTIN
+
 config INTERPRETERS_WAMR_LIBC_WASI
 	bool "Enable WASI libc"
 	select PSEUDOFS_SOFTLINKS
diff --git a/tools/Wasm.mk b/tools/Wasm.mk
index 99e93f33c..4c6d20d60 100644
--- a/tools/Wasm.mk
+++ b/tools/Wasm.mk
@@ -19,9 +19,8 @@
 #
 ############################################################################
 
-# Only build wasm if one of the following runtime is enabled
 
-ifneq ($(CONFIG_INTERPRETERS_WAMR)$(CONFIG_INTERPRETERS_WASM)$(CONFIG_INTERPRETERS_TOYWASM),)
+ifeq ($(CONFIG_INTERPRETERS_WAMR_BUILD_MODULES_FOR_NUTTX),y)
 include $(APPDIR)$(DELIM)tools$(DELIM)WASI-SDK.defs
 include $(APPDIR)$(DELIM)interpreters$(DELIM)wamr$(DELIM)Toolchain.defs
 
@@ -113,4 +112,4 @@ clean::
 
 endif # WASM_BUILD
 
-endif # CONFIG_INTERPRETERS_WAMR || CONFIG_INTERPRETERS_WASM || CONFIG_INTERPRETERS_TOYWASM
+endif