From 9e3ec98937de07d0e06f483ba8f7e6592b4dd152 Mon Sep 17 00:00:00 2001 From: Frank Denis <124872+jedisct1@users.noreply.github.com> Date: Tue, 24 Aug 2021 02:06:02 +0200 Subject: [PATCH] Don't define valgrind_support on macOS (#9612) Unfortunately, Valgrind for macOS has been broken for years, and the Homebrew formula is only for Linux. --- src/stage1/target.cpp | 2 +- src/target.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stage1/target.cpp b/src/stage1/target.cpp index 6594eb57d5..8415b1934e 100644 --- a/src/stage1/target.cpp +++ b/src/stage1/target.cpp @@ -919,7 +919,7 @@ bool target_has_valgrind_support(const ZigTarget *target) { case ZigLLVM_UnknownArch: zig_unreachable(); case ZigLLVM_x86_64: - return (target->os == OsLinux || target_os_is_darwin(target->os) || target->os == OsSolaris || + return (target->os == OsLinux || target->os == OsSolaris || (target->os == OsWindows && target->abi != ZigLLVM_MSVC)); default: return false; diff --git a/src/target.zig b/src/target.zig index 06483d68ff..25a133f03b 100644 --- a/src/target.zig +++ b/src/target.zig @@ -163,7 +163,7 @@ pub fn isSingleThreaded(target: std.Target) bool { pub fn hasValgrindSupport(target: std.Target) bool { switch (target.cpu.arch) { .x86_64 => { - return target.os.tag == .linux or target.isDarwin() or target.os.tag == .solaris or + return target.os.tag == .linux or target.os.tag == .solaris or (target.os.tag == .windows and target.abi != .msvc); }, else => return false,