[chore] Set the full path of make program to CMake (#7909)
This commit is contained in:
3
build.sh
3
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 \
|
||||
|
||||
12
run-be-ut.sh
12
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
|
||||
|
||||
Reference in New Issue
Block a user