From 5152a8894f7f916cfb7d5aad3aa91ab770fd597a Mon Sep 17 00:00:00 2001 From: kostas Date: Wed, 15 Jan 2025 09:43:16 +0200 Subject: [PATCH] fix: cmake optional compiler-rt --- CMakeLists.txt | 8 +++++++- src/server/zset_family.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7896b1b90f0..dc35d62974aa 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,19 +40,25 @@ option(DF_USE_SSL "Provide support for SSL connections" ON) find_package(OpenSSL) +SET(SANITIZERS OFF) + option(WITH_ASAN "Enable -fsanitize=address" OFF) if (SUPPORT_ASAN AND WITH_ASAN) message(STATUS "address sanitizer enabled") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address") + set(SANITIZERS ON) endif() option(WITH_USAN "Enable -fsanitize=undefined" OFF) if (SUPPORT_USAN AND WITH_USAN) message(STATUS "ub sanitizer enabled") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=undefined") + set(SANITIZERS ON) endif() -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -rtlib=compiler-rt") +if(SANITIZERS) + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -rtlib=compiler-rt") +endif() include(third_party) include(internal) diff --git a/src/server/zset_family.h b/src/server/zset_family.h index a2d1bb35d954..b4e592766d02 100644 --- a/src/server/zset_family.h +++ b/src/server/zset_family.h @@ -29,7 +29,8 @@ class ZSetFamily { using MScoreResponse = std::vector>; struct Bound { - double val; + Bound() = default; + double val = 0; bool is_open = false; };