From f809632c0631529cec34be37c37fe5a5f3ac513c Mon Sep 17 00:00:00 2001 From: M Starch Date: Fri, 22 Nov 2024 12:36:33 -0800 Subject: [PATCH] Fixing sanitizer handling. Fixes nasa/fprime#2678 --- src/fprime/fbuild/cli.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fprime/fbuild/cli.py b/src/fprime/fbuild/cli.py index fa598f03..51044ec8 100644 --- a/src/fprime/fbuild/cli.py +++ b/src/fprime/fbuild/cli.py @@ -57,11 +57,11 @@ def run_fbuild_cli( toolchain = build.find_toolchain() print(f"[INFO] Generating build directory at: {build.build_dir}") print(f"[INFO] Using toolchain file {toolchain} for platform {parsed.platform}") - if parsed.ut and not parsed.disable_sanitizers: + if parsed.disable_sanitizers: # The following options are defined in F' to have CMake enable the sanitizers - cmake_args["ENABLE_SANITIZER_LEAK"] = "ON" - cmake_args["ENABLE_SANITIZER_ADDRESS"] = "ON" - cmake_args["ENABLE_SANITIZER_UNDEFINED_BEHAVIOR"] = "ON" + cmake_args["ENABLE_SANITIZER_LEAK"] = "OFF" + cmake_args["ENABLE_SANITIZER_ADDRESS"] = "OFF" + cmake_args["ENABLE_SANITIZER_UNDEFINED_BEHAVIOR"] = "OFF" if toolchain is not None: cmake_args["CMAKE_TOOLCHAIN_FILE"] = toolchain if parsed.ninja: