From 2b1479fa996c6cca3b87e41c7ef976aa0a8154af Mon Sep 17 00:00:00 2001 From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> Date: Tue, 9 Dec 2025 17:11:55 +0000 Subject: [PATCH] trying ABSL_ENABLE_CONSTANT_INIT_V2 flag Signed-off-by: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com> --- cmake/AbseilFix.cmake | 5 +++++ conan/profiles/sanitizers | 12 +++--------- 2 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 cmake/AbseilFix.cmake diff --git a/cmake/AbseilFix.cmake b/cmake/AbseilFix.cmake new file mode 100644 index 0000000000..89190f5a0e --- /dev/null +++ b/cmake/AbseilFix.cmake @@ -0,0 +1,5 @@ +# This file is included by Conan's toolchain file. +# We set the required CMake variable as a CACHE variable to ensure +# it takes effect during the configure step. + +set(ABSL_ENABLE_CONSTANT_INIT_V2 "OFF" CACHE BOOL "Disable Abseil's V2 constant init logic to fix compiler errors.") diff --git a/conan/profiles/sanitizers b/conan/profiles/sanitizers index cb8d291730..d7a719e0ae 100644 --- a/conan/profiles/sanitizers +++ b/conan/profiles/sanitizers @@ -35,6 +35,9 @@ include(default) tools.build:cxxflags+=['{{sanitizer_flags}} {{extra_cxxflags}}'] tools.build:sharedlinkflags+=['{{sanitizer_flags}}'] tools.build:exelinkflags+=['{{sanitizer_flags}}'] + tools.cmake.cmaketoolchain:user_toolchain+=['cmake/AbseilFix.cmake'] + tools.build:defines+=['ABSL_ENABLE_CONSTANT_INIT_V2=0'] + tools.build:cflags+=['-DABSL_ENABLE_CONSTANT_INIT_V2=0'] {% endif %} {% elif compiler == "apple-clang" or compiler == "clang" %} {% if "Address" in sanitizers or "Thread" in sanitizers or "UndefinedBehavior" in sanitizers %} @@ -63,12 +66,3 @@ include(default) {% endif %} tools.info.package_id:confs+=["tools.build:cxxflags", "tools.build:exelinkflags", "tools.build:sharedlinkflags", "tools.build:defines", "tools.cmake.cmaketoolchain:user_toolchain"] - -[options] -{% if compiler == "gcc" %} - {% if sanitizers == "Address" or sanitizers == "Thread" %} - abseil/*:ABSL_ENABLE_CONSTANT_INIT_V2=OFF - abseil/*:defines+=['ABSL_ENABLE_CONSTANT_INIT_V2=OFF'] - abseil/*:extra_cxxflags+="-DABSL_ENABLE_CONSTANT_INIT_V2=OFF" - {% endif %} -{% endif %}