From e7103bfd0803929fcfcfc94ced7fa6adfd57c0e8 Mon Sep 17 00:00:00 2001
From: Adonis Ling <adonis0147@gmail.com>
Date: Sun, 6 Feb 2022 08:34:08 +0800
Subject: [PATCH] [chore] Set the full path of make program to CMake (#7909)

---
 build.sh     |  3 +++
 run-be-ut.sh | 12 ++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 80732ba856..ad1399186b 100755
--- a/build.sh
+++ b/build.sh
@@ -222,9 +222,12 @@ if [ ${BUILD_BE} -eq 1 ] ; then
     if [ ${CLEAN} -eq 1 ]; then
         clean_be
     fi
+    MAKE_PROGRAM="$(which "${BUILD_SYSTEM}")"
+    echo "-- Make program: ${MAKE_PROGRAM}"
     mkdir -p ${CMAKE_BUILD_DIR}
     cd ${CMAKE_BUILD_DIR}
     ${CMAKE_CMD} -G "${GENERATOR}"  \
+            -DCMAKE_MAKE_PROGRAM="${MAKE_PROGRAM}" \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
             -DMAKE_TEST=OFF \
diff --git a/run-be-ut.sh b/run-be-ut.sh
index 1aa420b541..51f27f5d0e 100755
--- a/run-be-ut.sh
+++ b/run-be-ut.sh
@@ -126,9 +126,17 @@ else
     echo "=== Running All tests ==="
 fi
 
+MAKE_PROGRAM="$(which "${BUILD_SYSTEM}")"
+echo "-- Make program: ${MAKE_PROGRAM}"
+
 cd ${CMAKE_BUILD_DIR}
-${CMAKE_CMD} -G "${GENERATOR}" ../ -DWITH_MYSQL=OFF -DMAKE_TEST=ON -DBUILD_META_TOOL=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-    -DGLIBC_COMPATIBILITY=${GLIBC_COMPATIBILITY} ${CMAKE_USE_CCACHE}
+${CMAKE_CMD} -G "${GENERATOR}" \
+    -DCMAKE_MAKE_PROGRAM="${MAKE_PROGRAM}" \
+    -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
+    -DMAKE_TEST=ON \
+    -DGLIBC_COMPATIBILITY="${GLIBC_COMPATIBILITY}" \
+    -DWITH_MYSQL=OFF \
+    ${CMAKE_USE_CCACHE} ../
 ${BUILD_SYSTEM} -j ${PARALLEL} $RUN_FILE
 
 if [ ${RUN} -ne 1 ]; then