From f228cf878a8c06f036bef9f7fceb9ed32028e48c Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Mon, 10 Jun 2024 17:29:58 +0200 Subject: [PATCH 1/2] cirrus: Unset CCACHE_BASEDIR for asan/coverage build When CCACHE_BASEDIR is set, ccache will rewrite absolute paths to relative paths in order to allow compilation in different source directories. We do not need this feature on Cirrus (the checkout is always in /zeek) and using absolute paths avoids confusion/normalization needs for the gcov -p results. We could consider removing the global CCACHE_BASEDIR, but it'd bust the ccache of every other task, too. --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 54458bfd38..e159dbb0ac 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -397,6 +397,8 @@ asan_sanitizer_task: CXXFLAGS: -DZEEK_DICT_DEBUG ZEEK_CI_CONFIGURE_FLAGS: *ASAN_SANITIZER_CONFIG ASAN_OPTIONS: detect_leaks=1:detect_odr_violation=0 + # Use absolute paths for coverage files. + CCACHE_BASEDIR: ubsan_sanitizer_task: container: From 8bf3d3c7fcc88eff035adacfbc929d18a0a254ce Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Mon, 10 Jun 2024 20:10:53 +0200 Subject: [PATCH 2/2] Bump cmake for -fprofile-update=atomic usage --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index aeca56db02..f07d6ca3af 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit aeca56db02ef5056ea880ec7fa94463841b4b535 +Subproject commit f07d6ca3af3a7d821d1b9369d24aa91e053396a2