Skip to content

Commit

Permalink
[sanitizer] Remove unneeded ccache -s
Browse files Browse the repository at this point in the history
  • Loading branch information
vitalybuka committed Dec 11, 2024
1 parent 06ea8c4 commit 27afb36
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions zorg/buildbot/builders/sanitizers/buildbot_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,11 @@ function build_stage1_clang_impl {
if clang -v ; then
cmake_stage1_options+=" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++"
fi
ccache -z || true
(cd ${STAGE1_DIR} && cmake ${cmake_stage1_options} $LLVM && ninja) || {
touch "${STAGE1_DIR}/delete_next_time"
return 1
}
md5sum ${STAGE1_DIR}/bin/clang || true
ccache -s || true
}

function build_stage1_clang {
Expand Down Expand Up @@ -470,8 +468,6 @@ function build_stage3 {
local sanitizer_name=$1
echo @@@BUILD_STEP build stage3/$sanitizer_name build@@@

ccache -z || true

local build_dir=llvm_build2_${sanitizer_name}

local clang_path=$ROOT/${STAGE2_DIR}/bin
Expand All @@ -482,13 +478,15 @@ function build_stage3 {
# FIXME: clangd tests fail.
stage3_projects='clang;lld'
fi
# -DLLVM_CCACHE_BUILD=OFF to track real build time.
(cd ${build_dir} && \
cmake \
${CMAKE_COMMON_OPTIONS} \
-DLLVM_ENABLE_PROJECTS="${stage3_projects}" \
-DCMAKE_C_COMPILER=${clang_path}/clang \
-DCMAKE_CXX_COMPILER=${clang_path}/clang++ \
-DCMAKE_CXX_FLAGS="${sanitizer_cflags}" \
-DLLVM_CCACHE_BUILD=OFF \
$LLVM && \
/usr/bin/time -o ${ROOT}/time.txt -- ninja ) || {
build_failure
Expand All @@ -498,8 +496,6 @@ function build_stage3 {
(md5sum ${build_dir}/bin/clang* > ${ROOT}/md5.txt) || true

upload_stats stage3

ccache -s || true
}

function build_stage3_msan {
Expand Down

0 comments on commit 27afb36

Please sign in to comment.