gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-02-11 09:25:20 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Enable auto install wasi-sdk when build wamr-sdk (#796)

Browse Source 
And fix -q[<App Name>] show error in host_tool help.
This commit is contained in:
Wenyong Huang 2021-10-22 16:53:25 +08:00 committed by GitHub
parent 32242988ed
commit 6b3a939370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-tools/host-tool/src/main.c
View File

@ -391,7 +391,7 @@ static void showUsage()
" [--watchdog=<Watchdog Interval>]\n" " [--watchdog=<Watchdog Interval>]\n"
" [<Control Options> ...] \n"); " [<Control Options> ...] \n");
printf(" host_tool -u <App Name> [<Control Options> ...]\n"); printf(" host_tool -u <App Name> [<Control Options> ...]\n");
printf(" host_tool -q [<App Name>] [<Control Options> ...]\n"); printf(" host_tool -q[<App Name>] [<Control Options> ...]\n");
printf(" host_tool -r <Resource URL> -A <Action> [-p <Payload File>] [<Control Options> ...]\n"); printf(" host_tool -r <Resource URL> -A <Action> [-p <Payload File>] [<Control Options> ...]\n");
printf(" host_tool -s <Event URLs> [<Control Options> ...]\n"); printf(" host_tool -s <Event URLs> [<Control Options> ...]\n");
printf(" host_tool -d <Event URLs> [<Control Options> ...]\n"); printf(" host_tool -d <Event URLs> [<Control Options> ...]\n");

19
wamr-sdk/build_sdk.sh
View File

@ -65,14 +65,12 @@ done
if [ ! -f "/opt/wasi-sdk/bin/clang" ]; then if [ ! -f "/opt/wasi-sdk/bin/clang" ]; then
echo "Can't find wasi-sdk under /opt/wasi-sdk" echo "Intall wasi-sdk.." &&
echo "You can download wasi-sdk from here:" rm -fr wasi-sdk-* /opt/wasi-sdk &&
echo "" wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz &&
echo "https://github.com/CraneStation/wasi-sdk/releases/tag/wasi-sdk-7" tar -zxf wasi-sdk-12.0-linux.tar.gz &&
echo "" mv wasi-sdk-12.0 /opt/wasi-sdk &&
echo "please install it to the default path for your convenience" rm -f wasi-sdk-12.0-linux.tar.gz
echo ""
exit 1
fi fi
@ -190,7 +188,10 @@ if [ -n "$out" ]; then
fi fi
if [ "${LIBC_SUPPORT}" = "WASI" ]; then if [ "${LIBC_SUPPORT}" = "WASI" ]; then
echo "using wasi toolchain" echo "using wasi toolchain"
cmake .. $CM_DEXTRA_SDK_INCLUDE_PATH -DWAMR_BUILD_SDK_PROFILE=${PROFILE} -DCONFIG_PATH=${wamr_config_cmake_file} -DCMAKE_TOOLCHAIN_FILE=../wasi_toolchain.cmake cmake .. $CM_DEXTRA_SDK_INCLUDE_PATH \
-DWAMR_BUILD_SDK_PROFILE=${PROFILE} \
-DCONFIG_PATH=${wamr_config_cmake_file} \
-DCMAKE_TOOLCHAIN_FILE=../wasi_toolchain.cmake
else else
echo "using builtin libc toolchain" echo "using builtin libc toolchain"
cmake .. $CM_DEXTRA_SDK_INCLUDE_PATH \ cmake .. $CM_DEXTRA_SDK_INCLUDE_PATH \