Skip to content

Commit 6b3a939

Browse files
authored
Enable auto install wasi-sdk when build wamr-sdk (#796)
And fix -q[<App Name>] show error in host_tool help.
1 parent 3224298 commit 6b3a939

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

test-tools/host-tool/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ static void showUsage()
391391
" [--watchdog=<Watchdog Interval>]\n"
392392
" [<Control Options> ...] \n");
393393
printf(" host_tool -u <App Name> [<Control Options> ...]\n");
394-
printf(" host_tool -q [<App Name>] [<Control Options> ...]\n");
394+
printf(" host_tool -q[<App Name>] [<Control Options> ...]\n");
395395
printf(" host_tool -r <Resource URL> -A <Action> [-p <Payload File>] [<Control Options> ...]\n");
396396
printf(" host_tool -s <Event URLs> [<Control Options> ...]\n");
397397
printf(" host_tool -d <Event URLs> [<Control Options> ...]\n");

wamr-sdk/build_sdk.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,12 @@ done
6565

6666

6767
if [ ! -f "/opt/wasi-sdk/bin/clang" ]; then
68-
echo "Can't find wasi-sdk under /opt/wasi-sdk"
69-
echo "You can download wasi-sdk from here:"
70-
echo ""
71-
echo "https://github.com/CraneStation/wasi-sdk/releases/tag/wasi-sdk-7"
72-
echo ""
73-
echo "please install it to the default path for your convenience"
74-
echo ""
75-
exit 1
68+
echo "Intall wasi-sdk.." &&
69+
rm -fr wasi-sdk-* /opt/wasi-sdk &&
70+
wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz &&
71+
tar -zxf wasi-sdk-12.0-linux.tar.gz &&
72+
mv wasi-sdk-12.0 /opt/wasi-sdk &&
73+
rm -f wasi-sdk-12.0-linux.tar.gz
7674
fi
7775

7876

@@ -190,7 +188,10 @@ if [ -n "$out" ]; then
190188
fi
191189
if [ "${LIBC_SUPPORT}" = "WASI" ]; then
192190
echo "using wasi toolchain"
193-
cmake .. $CM_DEXTRA_SDK_INCLUDE_PATH -DWAMR_BUILD_SDK_PROFILE=${PROFILE} -DCONFIG_PATH=${wamr_config_cmake_file} -DCMAKE_TOOLCHAIN_FILE=../wasi_toolchain.cmake
191+
cmake .. $CM_DEXTRA_SDK_INCLUDE_PATH \
192+
-DWAMR_BUILD_SDK_PROFILE=${PROFILE} \
193+
-DCONFIG_PATH=${wamr_config_cmake_file} \
194+
-DCMAKE_TOOLCHAIN_FILE=../wasi_toolchain.cmake
194195
else
195196
echo "using builtin libc toolchain"
196197
cmake .. $CM_DEXTRA_SDK_INCLUDE_PATH \

0 commit comments

Comments
 (0)