From 0e74d57245ddfbed9583da26290a6437a9273c37 Mon Sep 17 00:00:00 2001 From: Christian Reimer Date: Fri, 31 Jan 2025 20:34:43 -0800 Subject: [PATCH] Add symbolizer paths for UBSAN, MSAN, and TSAN in _symbolizer_env function --- cc/defs.bzl | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cc/defs.bzl b/cc/defs.bzl index f8deddb..7a4e854 100644 --- a/cc/defs.bzl +++ b/cc/defs.bzl @@ -114,8 +114,18 @@ def _symbolizer_env(val): return select({ # The + operator is not supported on dict and select types so we need to be # clever here. - Label("//cc:enable_symbolizer_x86_64_linux"): dict(val, **{"ASAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)"}), - Label("//cc:enable_symbolizer_x86_64_darwin"): dict(val, **{"ASAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)"}), + Label("//cc:enable_symbolizer_x86_64_linux"): dict(val, **{ + "ASAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)", + "UBSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)", + "MSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)", + "TSAN_SYMBOLIZER_PATH": "$(location @x86_64-linux-llvm//:symbolizer)", + }), + Label("//cc:enable_symbolizer_x86_64_darwin"): dict(val, **{ + "ASAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)", + "UBSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)", + "MSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)", + "TSAN_SYMBOLIZER_PATH": "$(location @x86_64-darwin-llvm//:symbolizer)", + }), "//conditions:default": {}, })