From 0a4034c10fff04c1b749b3c305a917a621827980 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Mon, 2 Aug 2021 19:26:00 +0000 Subject: [PATCH] build: switch the make check bot to Clang. Signed-off-by: Radoslaw Zarzynski --- run-make-check.sh | 18 +++++++++++++++++- src/script/run-make.sh | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/run-make-check.sh b/run-make-check.sh index f0d0397f702..1e163509d8e 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -70,8 +70,24 @@ function main() { return 1 fi FOR_MAKE_CHECK=1 prepare + local cxx_compiler=g++ + local c_compiler=gcc + for i in $(seq 14 -1 10); do + if type -t clang-$i > /dev/null; then + cxx_compiler="clang++-$i" + c_compiler="clang-$i" + break + fi + done # Init defaults after deps are installed. - local cmake_opts=" -DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_CEPHFS_SHELL=ON -DWITH_GRAFANA=ON -DWITH_SPDK=ON -DENABLE_GIT_VERSION=OFF" + local cmake_opts + cmake_opts+=" -DCMAKE_CXX_COMPILER=$cxx_compiler -DCMAKE_C_COMPILER=$c_compiler" + cmake_opts+=" -DENABLE_GIT_VERSION=OFF" + cmake_opts+=" -DWITH_GTEST_PARALLEL=ON" + cmake_opts+=" -DWITH_FIO=ON" + cmake_opts+=" -DWITH_CEPHFS_SHELL=ON" + cmake_opts+=" -DWITH_GRAFANA=ON" + cmake_opts+=" -DWITH_SPDK=ON" if [ $WITH_SEASTAR ]; then cmake_opts+=" -DWITH_SEASTAR=ON" fi diff --git a/src/script/run-make.sh b/src/script/run-make.sh index 2c07b645fea..159766b867e 100755 --- a/src/script/run-make.sh +++ b/src/script/run-make.sh @@ -105,7 +105,7 @@ function prepare() { exit 1 fi if [ -n "$install_cmd" ]; then - do_install "$install_cmd" ccache $which_pkg + do_install "$install_cmd" ccache $which_pkg clang else echo "WARNING: Don't know how to install packages" >&2 echo "This probably means distribution $ID is not supported by run-make-check.sh" >&2 -- 2.39.5