From 8930743831dcae07c2d52b04b3f4266a521c3f2a Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi 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 Also, this fixes warnings like: ``` spacetanuki% ./tools/configure.sh -E sim:wamr Copy files Select CONFIG_HOST_MACOS=y Refreshing... /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory CP: arch/dummy/Kconfig to /Users/yamamoto/git/nuttx/nuttx/arch/dummy/dummy_kconf ig CP: boards/dummy/Kconfig to /Users/yamamoto/git/nuttx/nuttx/boards/dummy/dummy_k config /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory /usr/local/bin/bash: line 1: /bin/clang: No such file or directory ``` --- interpreters/wamr/Kconfig | 5 +++++ tools/Wasm.mk | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) 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