From 4a7fedecd070c0dc000453c5afe23ee207a6b4af Mon Sep 17 00:00:00 2001 From: ota Date: Sat, 16 Dec 2023 08:41:01 +0200 Subject: [PATCH] check for cmake after installind packges, because CI doesn't care about cmake during build, only installing packages step --- build_linux_deps.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build_linux_deps.sh b/build_linux_deps.sh index 4abb43b6..1b727cf0 100644 --- a/build_linux_deps.sh +++ b/build_linux_deps.sh @@ -26,11 +26,6 @@ third_party_deps_dir="$third_party_dir/deps/linux" third_party_common_dir="$third_party_dir/deps/common/src" mycmake="$third_party_deps_dir/cmake-3.27.7-linux-x86_64/bin/cmake" -[[ -f "$mycmake" ]] || { - echo "[X] Couldn't find cmake" >&2; - exit 1; -} - # < 0: deduce, > 1: force PARALLEL_THREADS_OVERRIDE=-1 VERBOSITY='' @@ -84,6 +79,11 @@ last_code=$((last_code + $?)) echo ; echo +[[ -f "$mycmake" ]] || { + echo "[X] Couldn't find cmake" >&2; + exit 1; +} + # use 70% build_threads="$(( $(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 0) * 70 / 100 ))" [[ $PARALLEL_THREADS_OVERRIDE -gt 0 ]] && build_threads="$PARALLEL_THREADS_OVERRIDE"