From 2976077d1c3782b67920e4d98c72ddb9ad203f64 Mon Sep 17 00:00:00 2001 From: Vladimir Lazarev Date: Thu, 28 Mar 2019 21:29:19 +0300 Subject: [PATCH] [SYCL] do clean build if incremental cmake command failed Signed-off-by: Vladimir Lazarev --- buildbot/configure.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/buildbot/configure.sh b/buildbot/configure.sh index 40209e41d16ab..0fe5d0ed82548 100755 --- a/buildbot/configure.sh +++ b/buildbot/configure.sh @@ -26,10 +26,18 @@ done && shift $(($OPTIND - 1)) # we're in llvm.obj dir BUILD_DIR=${PWD} -cmake -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang \ +CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang \ -DLLVM_EXTERNAL_SYCL_SOURCE_DIR=../llvm.src/sycl \ -DLLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR=../llvm.src/llvm-spirv \ -DLLVM_TOOL_SYCL_BUILD=ON -DLLVM_TOOL_LLVM_SPIRV_BUILD=ON \ - -DOpenCL_INCLUDE_DIR="OpenCL-Headers" \ - -DOpenCL_LIBRARY="OpenCL-ICD-Loader/build/lib/libOpenCL.so" \ - ../llvm.src/llvm + -DOpenCL_INCLUDE_DIR=OpenCL-Headers \ + -DOpenCL_LIBRARY=OpenCL-ICD-Loader/build/lib/libOpenCL.so \ + ../llvm.src/llvm" + +cmake $CMAKE_ARGS +# Do clean build if configure failed due to any reason +if [ $? -ne 0 ]; then + rm -rf * + `dirname $0`/dependency.sh -b $BRANCH -n $BUILD_NUMBER -r $PR_NUMBER + cmake $CMAKE_ARGS +fi