diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh index 587a4f5ef61d..3bd38579f934 100755 --- a/scripts/setup-macos.sh +++ b/scripts/setup-macos.sh @@ -36,7 +36,6 @@ NPROC=$(getconf _NPROCESSORS_ONLN) DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)} MACOS_VELOX_DEPS="bison boost double-conversion flex gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 simdjson snappy thrift xz zstd" -MACOS_VELOX_DEPS="bison flex gflags glog googletest icu4c libevent libsodium lz4 lzo openssl protobuf@21 snappy xz zstd" MACOS_BUILD_DEPS="ninja cmake" FB_OS_VERSION="v2024.05.20.00" FMT_VERSION="10.1.1" @@ -68,6 +67,10 @@ function install_from_brew { } function install_build_prerequisites { + for pkg in ${MACOS_BUILD_DEPS} + do + install_from_brew ${pkg} + done if [ ! -f ${PYTHON_VENV}/pyvenv.cfg ]; then echo "Creating Python Virtual Environment at ${PYTHON_VENV}" python3 -m venv ${PYTHON_VENV} @@ -140,6 +143,7 @@ function install_re2 { } function install_velox_deps { + run_and_time install_velox_deps_from_brew run_and_time install_ranges_v3 run_and_time install_double_conversion run_and_time install_re2 @@ -156,6 +160,7 @@ function install_velox_deps { (return 2> /dev/null) && return # If script was sourced, don't run commands. ( + update_brew if [[ $# -ne 0 ]]; then for cmd in "$@"; do run_and_time "${cmd}"