From 821984feece2129b3ad00235e8d0d2e2df3ba117 Mon Sep 17 00:00:00 2001 From: slipher Date: Thu, 27 Mar 2025 09:41:32 -0500 Subject: [PATCH] external_deps: print error when curl not found Also allow --help without curl. --- external_deps/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/external_deps/build.sh b/external_deps/build.sh index a068ae5461..30db90aa5f 100755 --- a/external_deps/build.sh +++ b/external_deps/build.sh @@ -6,11 +6,6 @@ set -u -e -o pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" WORK_DIR="${PWD}" -# Do not reuse self-built curl from external_deps custom PATH -# to download source archives or we would get errors like: -# curl: (1) Protocol "https" not supported or disabled in libcurl -CURL="$(command -v curl)" - # This should match the DEPS_VERSION in CMakeLists.txt. # This is mostly to ensure the path the files end up at if you build deps yourself # are the same as the ones when extracting from the downloaded packages. @@ -1263,6 +1258,11 @@ if [ "${#}" -lt "2" ]; then errorHelp fi +# Do not reuse self-built curl from external_deps custom PATH +# to download source archives or we would get errors like: +# curl: (1) Protocol "https" not supported or disabled in libcurl +CURL="$(command -v curl)" || log error "Command 'curl' not found" + # Enable parallel build export MAKEFLAGS="-j`nproc 2> /dev/null || sysctl -n hw.ncpu 2> /dev/null || echo 1`"