From ab33d2e7a90346be43693a7dd0e2276e894a67ba Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 19 Oct 2024 00:36:16 -0700 Subject: [PATCH] add missing check for output mode in tsan logic --- src/Compilation.zig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Compilation.zig b/src/Compilation.zig index 870d5faf8f..a4d464068e 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -1886,7 +1886,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil try comp.queueJob(.libcxx); try comp.queueJob(.libcxxabi); } - if (build_options.have_llvm and comp.config.any_sanitize_thread) { + if (build_options.have_llvm and is_exe_or_dyn_lib and comp.config.any_sanitize_thread) { try comp.queueJob(.libtsan); } @@ -1914,11 +1914,9 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil } } - if (comp.config.any_fuzz and capable_of_building_compiler_rt) { - if (is_exe_or_dyn_lib) { - log.debug("queuing a job to build libfuzzer", .{}); - comp.job_queued_fuzzer_lib = true; - } + if (is_exe_or_dyn_lib and comp.config.any_fuzz and capable_of_building_compiler_rt) { + log.debug("queuing a job to build libfuzzer", .{}); + comp.job_queued_fuzzer_lib = true; } }