From 610bc04c192b1e6c159d568f2a077957037a9d57 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Wed, 11 Jan 2017 23:20:58 +0100 Subject: [PATCH] Allow setting custom make and cmake in build/ci_build.sh --- build/ci_build.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/ci_build.sh b/build/ci_build.sh index 96f3aeaec..65e5ceb54 100755 --- a/build/ci_build.sh +++ b/build/ci_build.sh @@ -12,6 +12,8 @@ ACTIONS= BUILD_SYSTEM="${BUILD_SYSTEM:-autotools}" +MAKE="${MAKE:-make}" +CMAKE="${CMAKE:-cmake}" CURDIR=`pwd` SRCDIR="${SRCDIR:-`pwd`}" RET=0 @@ -79,21 +81,21 @@ for action in ${ACTIONS}; do configure) case "${BUILD_SYSTEM}" in autotools) "${SRCDIR}/configure" ${CONFIGURE_ARGS} ;; - cmake) cmake ${CONFIGURE_ARGS} "${SRCDIR}" ;; + cmake) ${CMAKE} ${CONFIGURE_ARGS} "${SRCDIR}" ;; esac RET="$?" ;; build) - make ${MAKE_ARGS} + ${MAKE} ${MAKE_ARGS} RET="$?" ;; test) case "${BUILD_SYSTEM}" in autotools) - make ${MAKE_ARGS} check LOG_DRIVER="${SRCDIR}/build/ci_test_driver" + ${MAKE} ${MAKE_ARGS} check LOG_DRIVER="${SRCDIR}/build/ci_test_driver" ;; cmake) - make ${MAKE_ARGS} test + ${MAKE} ${MAKE_ARGS} test ;; esac RET="$?" -- 2.47.3