diff --git a/external_deps/build.sh b/external_deps/build.sh index b78a9f5290..43efa90132 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. @@ -135,7 +130,7 @@ download() { log ERROR "No more mirror to download ${tarball_file} from" fi local download_url="${1}"; shift - log status "Downloading ${download_url}" + log STATUS "Downloading ${download_url}" if ! "${CURL}" -R -L --fail -o "${tarball_file}" "${download_url}" then log WARNING "Failed to download ${download_url}" @@ -1295,6 +1290,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`" export SCONSFLAGS="${MAKEFLAGS}"