Do not build in non-SSE4 mode. Remove Ninja and OpenSSL.

yugabyte · May 11, 2020 · bed2a49 · bed2a49
1 parent 339c750
commit bed2a49
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/brew-build.sh b/brew-build.sh
@@ -34,9 +34,7 @@ BREW_FROM_SRC_PACKAGES=(
   flex
   icu4c
   libtool
-  ninja
   readline
-  openssl
 )
 
 BREW_BIN_PACKAGES=()
@@ -46,8 +44,10 @@ echo "OSTYPE: $OSTYPE"
 if [[ $OSTYPE == linux* ]]; then
   BREW_BIN_PACKAGES+=( gcc@8 )
   BREW_FROM_SRC_PACKAGES+=( gcc libuuid )
-else
+elif [[ $OSTYPE == darwin* ]]; then
   BREW_FROM_SRC_PACKAGES+=( gnu-tar )
+else
+  fatal "Unknown OS type: $OSTYPE"
 fi
 
 # -------------------------------------------------------------------------------------------------
@@ -116,8 +116,7 @@ fi
 
 YB_BREW_BUILD_UNIT_TEST_MODE=${YB_BREW_BUILD_UNIT_TEST_MODE:-0}
 
-if [[ ${YB_BREW_BUILD_UNIT_TEST_MODE} == "1" ]]; then
-  BREW_FROM_SRC_PACKAGES=()
+if [[ $YB_BREW_BUILD_UNIT_TEST_MODE == "1" ]]; then
   BREW_BIN_PACKAGES=( patchelf )
   if [[ $OSTYPE == darwin* ]]; then
     BREW_BIN_PACKAGES+=( gnu-tar )

diff --git a/brew-clone-and-build-all.sh b/brew-clone-and-build-all.sh
@@ -25,7 +25,7 @@ export HOMEBREW_LOGS=$PWD/brew_logs
 set_brew_timestamp
 
 time (
-  for YB_USE_SSE4 in 1 0; do
+  for YB_USE_SSE4 in 1; do
     if [[ $YB_USE_SSE4 == "0" && ${YB_BREW_BUILD_SSE4_ONLY:-0} == "1" ]]; then
       log "Skipping building the non-SSE4 configuration: YB_BREW_BUILD_SSE4_ONLY is set"
       continue