From be9d91b371b6d83dc950dfe556504ff6fbc57e5a Mon Sep 17 00:00:00 2001
From: YAMAMOTO Takashi <yamamoto@midokura.com>
Date: Fri, 15 Sep 2023 17:52:23 +0900
Subject: [PATCH] Wasm.mk: disable by default

Fixes partly: https://github.com/apache/nuttx-apps/issues/2046
---
 interpreters/wamr/Kconfig | 5 +++++
 tools/Wasm.mk             | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/interpreters/wamr/Kconfig b/interpreters/wamr/Kconfig
index 0324f90ac6c..5466e68dc5b 100644
--- a/interpreters/wamr/Kconfig
+++ b/interpreters/wamr/Kconfig
@@ -70,6 +70,11 @@ config INTERPRETERS_WAMR_LIBC_BUILTIN
 	bool "Enable built-in libc"
 	default n
 
+config INTERPRETERS_WAMR_BUILD_WASM_MODULES_FOR_WAMR_LIBC_BUILTIN
+	bool "Build WASM modules for WAMR libc-builtin (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 99e93f33c32..8674a34e9ba 100644
--- a/tools/Wasm.mk
+++ b/tools/Wasm.mk
@@ -19,8 +19,8 @@
 #
 ############################################################################
 
-# Only build wasm if one of the following runtime is enabled
 
+ifeq ($(CONFIG_INTERPRETERS_WAMR_BUILD_WASM_MODULES_FOR_WAMR_LIBC_BUILTIN),y)
 ifneq ($(CONFIG_INTERPRETERS_WAMR)$(CONFIG_INTERPRETERS_WASM)$(CONFIG_INTERPRETERS_TOYWASM),)
 include $(APPDIR)$(DELIM)tools$(DELIM)WASI-SDK.defs
 include $(APPDIR)$(DELIM)interpreters$(DELIM)wamr$(DELIM)Toolchain.defs
@@ -114,3 +114,4 @@ clean::
 endif # WASM_BUILD
 
 endif # CONFIG_INTERPRETERS_WAMR || CONFIG_INTERPRETERS_WASM || CONFIG_INTERPRETERS_TOYWASM
+endif