From b50ee131009d17ccdd80c02d70f5be4c50156e38 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 12 Aug 2015 15:04:35 +0100 Subject: [PATCH] Fix checking of distcc --- utils/jenkins-build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh index 7393b852a..e34d26c06 100755 --- a/utils/jenkins-build.sh +++ b/utils/jenkins-build.sh @@ -381,10 +381,11 @@ fi DISTCC=distcc PARALLEL=1 -${DISTCC} --version >/dev/null 2>&1 -if [ $? -eq 0 ];then +HAVE_DISTCC=$(${DISTCC} --version >/dev/null 2>&1 && echo "true" || echo "false") +if [ ${HAVE_DISTCC} = "true" ];then PARALLEL=$(${DISTCC} -j) export PATH=/usr/lib/distcc:${PATH} + export DISTCC_DIR=${JENKINS_HOME} fi