fix comments and enable devtoolset9 on centos8

facebookincubator · Mar 2, 2024 · 77b538c · 77b538c
1 parent e2569c0
commit 77b538c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/scripts/setup-centos8.sh b/scripts/setup-centos8.sh
@@ -22,10 +22,10 @@
 #     Use "n" to never wipe directories.
 #
 # You can also run individual functions below by specifying them as arguments:
-# $ scripts/setup-macos.sh install_googletest install_fmt
+# $ scripts/setup-centos8.sh install_googletest install_fmt
 #
 
-set -eufx -o pipefail
+set -efx -o pipefail
 # Some of the packages must be build with the same compiler flags
 # so that some low level types are the same size. Also, disable warnings.
 SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
@@ -207,13 +207,20 @@ function install_velox_deps {
 
 (
   if [[ $# -ne 0 ]]; then
+    # Activate gcc9; enable errors on unset variables afterwards.
+    source /opt/rh/gcc-toolset-9/enable || exit 1
+    set -u
     for cmd in "$@"; do
       run_and_time "${cmd}"
     done
   else
     if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
+      echo "Installing build dependencies"
       run_and_time install_build_prerequisites
     fi
+    # Activate gcc9; enable errors on unset variables afterwards.
+    source /opt/rh/gcc-toolset-9/enable || exit 1
+    set -u
     install_velox_deps
   fi
 )

diff --git a/scripts/setup-macos.sh b/scripts/setup-macos.sh
@@ -142,14 +142,14 @@ function install_velox_deps {
 (return 2> /dev/null) && return # If script was sourced, don't run commands.
 
 (
-  echo "Installing mac dependencies"
   update_brew
   if [[ $# -ne 0 ]]; then
     for cmd in "$@"; do
       run_and_time "${cmd}"
     done
   else
     if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
+      echo "Installing build dependencies"
       run_and_time install_build_prerequisites
     fi
     install_velox_deps

diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh
@@ -22,7 +22,7 @@
 #     Use "n" to never wipe directories.
 #
 # You can also run individual functions below by specifying them as arguments:
-# $ scripts/setup-macos.sh install_googletest install_fmt
+# $ scripts/setup-ubuntu.sh install_googletest install_fmt
 #
 
 # Minimal setup for Ubuntu 20.04.
@@ -163,6 +163,7 @@ function install_velox_deps {
     done
   else
     if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
+      echo "Installing build dependencies"
       run_and_time install_build_prerequisites
     fi
     install_velox_deps