From 3c3a6519cce35d5643a9c05937d3661683fdac2f Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 3 Feb 2021 09:46:33 -0500 Subject: [PATCH] cmake: partial revert of BOOST_USE_VALGRIND when ALLOCATOR=libc the WITH_SYSTEM_BOOST binaries are not built with BOOST_USE_VALGRIND, so it probably isn't safe to define for the headers only this flag is needed for teuthology testing, and the shaman builds use WITH_SYSTEM_BOOST=OFF. so the better fix is to enable WITH_BOOST_VALGRIND so BuildBoost.cmake will build the libraries with valgrind support and add -DBOOST_USE_VALGRIND to the necessary targets this change was merged in https://github.com/ceph/ceph-build/pull/1736 Fixes: https://tracker.ceph.com/issues/48963 Signed-off-by: Casey Bodley --- CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c500f31cd7d..985cee4b204 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -350,13 +350,6 @@ else(ALLOCATOR) endif(gperftools_FOUND) endif(ALLOCATOR) -if(${ALLOCATOR} STREQUAL "libc" AND WITH_SYSTEM_BOOST) - # valgrind can only work with libc allocator - # if system boost is not used, valgrind use should - # be indicated via the WITH_BOOST_VALGRIND parameter - add_definitions(-DBOOST_USE_VALGRIND) -endif() - # Mingw generates incorrect entry points when using "-pie". if(WIN32 OR (HAVE_LIBTCMALLOC AND WITH_STATIC_LIBSTDCXX)) set(EXE_LINKER_USE_PIE FALSE) -- 2.39.5