Skip to content

Commit

Permalink
Wasm.mk: disable by default
Browse files Browse the repository at this point in the history
Fixes partly: #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

```
  • Loading branch information
yamt authored and xiaoxiang781216 committed Jan 13, 2024
1 parent 7047fa5 commit 8930743
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
5 changes: 5 additions & 0 deletions interpreters/wamr/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions tools/Wasm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -113,4 +112,4 @@ clean::

endif # WASM_BUILD

endif # CONFIG_INTERPRETERS_WAMR || CONFIG_INTERPRETERS_WASM || CONFIG_INTERPRETERS_TOYWASM
endif

0 comments on commit 8930743

Please sign in to comment.