will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

docker: Make build.sh more portable

Browse Source
This commit is contained in:
Riku Isokoski 2023-01-07 18:05:46 +02:00
parent fb19c491b6
commit bd8e6d8c15
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/build.sh
View File

@ -20,7 +20,7 @@ export GCC_ARM_VER=${GCC_ARM_VER:="10.3-2021.10"}
export NRF_SDK_VER=${NRF_SDK_VER:="nRF5_SDK_15.3.0_59ac345"} export NRF_SDK_VER=${NRF_SDK_VER:="nRF5_SDK_15.3.0_59ac345"}
MACHINE="$(uname -m)" MACHINE="$(uname -m)"
[[ "$MACHINE" == "arm64" ]] && MACHINE="aarch64" [ "$MACHINE" = "arm64" ] && MACHINE="aarch64"
export GCC_ARM_PATH="gcc-arm-none-eabi-$GCC_ARM_VER" export GCC_ARM_PATH="gcc-arm-none-eabi-$GCC_ARM_VER"
@ -29,9 +29,9 @@ main() {
mkdir -p "$TOOLS_DIR" mkdir -p "$TOOLS_DIR"
[[ ! -d "$TOOLS_DIR/$GCC_ARM_PATH" ]] && GetGcc [ ! -d "$TOOLS_DIR/$GCC_ARM_PATH" ] && GetGcc
[[ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ]] && GetNrfSdk [ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ] && GetNrfSdk
[[ ! -d "$TOOLS_DIR/mcuboot" ]] && GetMcuBoot [ ! -d "$TOOLS_DIR/mcuboot" ] && GetMcuBoot
mkdir -p "$BUILD_DIR" mkdir -p "$BUILD_DIR"
@ -73,13 +73,13 @@ CmakeGenerate() {
CmakeBuild() { CmakeBuild() {
local target="$1" local target="$1"
[[ -n "$target" ]] && target="--target $target" [ -n "$target" ] && target="--target $target"
if cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc) cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc)
then return 0; else return 1; BUILD_RESULT=$?
fi return $BUILD_RESULT
} }
if [[ $SOURCED == "false" ]]; then if [ $SOURCED = "false" ]; then
# It is important to return exit code of main # It is important to return exit code of main
# To be future-proof, this is handled explicitely # To be future-proof, this is handled explicitely
main "$@" main "$@"