From dc7177e745384ee7874bf08a2446fd3a30da328b Mon Sep 17 00:00:00 2001 From: Wang Xin Date: Sun, 23 Feb 2020 22:23:40 +0800 Subject: [PATCH] fix sample littlevgl build.sh issue (#174) --- samples/littlevgl/build.sh | 7 ++++++- wamr-sdk/build_sdk.sh | 5 +---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/samples/littlevgl/build.sh b/samples/littlevgl/build.sh index d1f596da..bb9b198d 100755 --- a/samples/littlevgl/build.sh +++ b/samples/littlevgl/build.sh @@ -4,6 +4,9 @@ PROJECT_DIR=$PWD WAMR_DIR=${PWD}/../.. OUT_DIR=${PWD}/out BUILD_DIR=${PWD}/build +LV_CFG_PATH=${PROJECT_DIR}/lv_config + + if [ -z $KW_BUILD ] || [ -z $KW_OUT_FILE ];then echo "Local Build Env" @@ -35,7 +38,8 @@ fi echo "##################### 0. build wamr-sdk littlevgl start#####################" cd ${WAMR_DIR}/wamr-sdk -./build_sdk.sh -n littlevgl -x ${PROJECT_DIR}/wamr_config_littlevgl.cmake +./build_sdk.sh -n littlevgl -x ${PROJECT_DIR}/wamr_config_littlevgl.cmake -e ${LV_CFG_PATH} +[ $? -eq 0 ] || exit $? echo "#####################build wamr-sdk littlevgl success" echo -e "\n\n" @@ -60,6 +64,7 @@ mkdir -p vgl-wasm-runtime cd vgl-wasm-runtime $cmakewrap ${PROJECT_DIR}/vgl-wasm-runtime $makewrap +[ $? -eq 0 ] || exit $? cp vgl_wasm_runtime ${OUT_DIR}/ echo "##################### build littlevgl wasm runtime end#####################" diff --git a/wamr-sdk/build_sdk.sh b/wamr-sdk/build_sdk.sh index ff8a460e..eda15c3a 100755 --- a/wamr-sdk/build_sdk.sh +++ b/wamr-sdk/build_sdk.sh @@ -180,10 +180,7 @@ if [ -n "$out" ]; then fi if [ "${LIBC_SUPPORT}" = "WASI" ]; then 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 echo "using builtin libc toolchain" cmake .. $CM_DEXTRA_SDK_INCLUDE_PATH \