From 2c40f55cd3ea65d4da15a93817b94d8808b8ce30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@galeracluster.com>
Date: Thu, 6 Apr 2023 13:57:56 +0300
Subject: [PATCH] MDEV-23117 : Galera build script does not work in RHEL 8

RHEL8 scoons has different name scons-3
---
 scripts/build.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index ab286466a..b2977fc2c 100755
--- 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