MDEV-23117 : Galera build script does not work in RHEL 8

RHEL8 scoons has different name scons-3
codership · Apr 6, 2023 · 2c40f55 · 2c40f55
1 parent 06a0c28
commit 2c40f55
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eu
+set -eux
 
 # $Id$
 
@@ -52,6 +52,10 @@ Options:
 EOF
 }
 
+# Scons executable on RHEL-8 is scons-3
+SCONSBIN=scons
+[[ -n "$(which scons-3)" ]] && SCONSBIN=scons-3
+
 OS=$(uname)
 # disable building vsbes by default
 DISABLE_VSBES=${DISABLE_VSBES:-"yes"}
@@ -452,12 +456,12 @@ then
 
     if [ "$SCRATCH" == "yes" ]
     then
-        scons -Q -c --conf=force $scons_args $SCONS_OPTS
+        ${SCONSBIN} -Q -c --conf=force $scons_args $SCONS_OPTS
     fi
 
     if [ "$SKIP_BUILD" != "yes" ]
     then
-        scons $scons_args -j $JOBS $SCONS_OPTS
+        ${SCONSBIN} $scons_args -j $JOBS $SCONS_OPTS
     fi
 
 elif test "$SKIP_BUILD" == "no"; then # Build using autotools