Address review comments

facebookincubator · Mar 22, 2024 · 3e61634 · 3e61634
1 parent 04f74fb
commit 3e61634
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/scripts/setup-centos8.sh b/scripts/setup-centos8.sh
@@ -51,7 +51,7 @@ function install_build_prerequisites {
   dnf config-manager --set-enabled powertools
   dnf update -y
   dnf_install ninja-build cmake curl ccache gcc-toolset-9 git wget which
-  dnf_install autoconf automake python3 libtool
+  dnf_install autoconf automake python39 python39-devel libtool
 }
 
 # Install dependencies from the package managers.
@@ -218,6 +218,8 @@ function install_velox_deps {
     if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
       echo "Installing build dependencies"
       run_and_time install_build_prerequisites
+    else
+      echo "Skipping installation of build dependencies since INSTALL_PREREQUISITES is not set"
     fi
     # Activate gcc9; enable errors on unset variables afterwards.
     source /opt/rh/gcc-toolset-9/enable || exit 1

diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh
@@ -152,6 +152,8 @@ function install_velox_deps {
     if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
       echo "Installing build dependencies"
       run_and_time install_build_prerequisites
+    else
+      echo "Skipping installation of build dependencies since INSTALL_PREREQUISITES is not set"
     fi
     install_velox_deps
     echo "All deps for Velox installed! Now try \"make\""

diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
@@ -50,7 +50,7 @@ function install_build_prerequisites {
   # installing libunwind first fixes this.
   ${SUDO} apt install -y libunwind-dev
   ${SUDO} apt install -y \
-    g++ \
+    build-essential \
     cmake \
     ccache \
     ninja-build \
@@ -166,6 +166,8 @@ function install_velox_deps {
     if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
       echo "Installing build dependencies"
       run_and_time install_build_prerequisites
+    else
+      echo "Skipping installation of build dependencies since INSTALL_PREREQUISITES is not set"
     fi
     install_velox_deps
     echo "All dependencies for Velox installed!"