Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions external_deps/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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}"
Expand Down Expand Up @@ -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}"
Expand Down