christoph/wamr
1
Fork 0
Code Releases Activity

Refine wamr-sdk build scripts (#801)

Browse Source 
Avoid hardcoding the path of wasi-sdk in wamr_toolchain.cmake,
allow passing -w [wasi-sdk path] to build_sdk.sh,
allow passing OUT_DIR to app-sdk and runtime-sdk,
and optimize message information.
This commit is contained in:
liang.he
2021-10-26 14:20:29 +08:00
committed by GitHub
parent 6b3a939370
commit 1a987ae59b
4 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wamr-sdk/app/CMakeLists.txt
View File

@ -12,7 +12,7 @@ endif ()
if (NOT DEFINED CONFIG_PATH)
set (CONFIG_PATH ${CMAKE_CURRENT_LIST_DIR}/../wamr_config_default.cmake)
message(STATUS, "CONFIG_PATH set to ${CONFIG_PATH} ")
message(STATUS "CONFIG_PATH set to ${CONFIG_PATH} ")
endif ()
if (NOT EXISTS "${CONFIG_PATH}")
@ -21,8 +21,9 @@ endif ()
include(${CONFIG_PATH})
set (OUT_DIR "${CMAKE_CURRENT_LIST_DIR}/../out/${WAMR_BUILD_SDK_PROFILE}")
if (NOT DEFINED OUT_DIR)
set (OUT_DIR "${CMAKE_CURRENT_LIST_DIR}/../out/${WAMR_BUILD_SDK_PROFILE}")
endif ()
set (APP_SDK_DIR "${OUT_DIR}/app-sdk")
if (DEFINED EXTRA_SDK_INCLUDE_PATH)

19
wamr-sdk/app/wamr_toolchain.cmake
View File

@ -1,13 +1,18 @@
# Copyright (C) 2019 Intel Corporation. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
SET(CMAKE_SYSTEM_NAME Linux)
SET(CMAKE_SYSTEM_PROCESSOR wasm32)
SET (CMAKE_SYSROOT ${CMAKE_CURRENT_LIST_DIR}/libc-builtin-sysroot)
SET (CMAKE_SYSTEM_NAME Linux)
SET (CMAKE_SYSTEM_PROCESSOR wasm32)
SET (CMAKE_SYSROOT ${CMAKE_CURRENT_LIST_DIR}/libc-builtin-sysroot)
IF (NOT (DEFINED WASI_SDK_DIR OR DEFINED CACHE{WASI_SDK_DIR}))
MESSAGE (FATAL_ERROR "WASI_SDK_DIR is not defined")
ELSE ()
MESSAGE (STATUS "WASI_SDK_DIR=${WASI_SDK_DIR}")
LIST (APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES "WASI_SDK_DIR")
ENDIF ()
if (NOT DEFINED WASI_SDK_DIR)
SET (WASI_SDK_DIR "/opt/wasi-sdk")
endif ()
SET (CMAKE_C_FLAGS "-nostdlib -z stack-size=4096" CACHE INTERNAL "")
SET (CMAKE_C_COMPILER_TARGET "wasm32")
@ -26,4 +31,4 @@ SET (CMAKE_NM "${WASI_SDK_DIR}/bin/llvm-nm" CACHE INTER
SET (CMAKE_OBJDUMP "${WASI_SDK_DIR}/bin/llvm-dwarfdump" CACHE INTERNAL "")
SET (CMAKE_RANLIB "${WASI_SDK_DIR}/bin/llvm-ranlib" CACHE INTERNAL "")
SET (CMAKE_EXE_LINKER_FLAGS
"${CMAKE_EXE_LINKER_FLAGS},--allow-undefined-file=${CMAKE_SYSROOT}/share/defined-symbols.txt" CACHE INTERNAL "")
"${CMAKE_EXE_LINKER_FLAGS},--allow-undefined-file=${CMAKE_SYSROOT}/share/defined-symbols.txt" CACHE INTERNAL "")