From 786397ed49c4a69acbe920814b41d57129915622 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Thu, 19 Mar 2020 08:50:20 +0000 Subject: [PATCH] symbolizer-path =================================================================== Gbp-Pq: Name symbolizer-path.diff --- .../sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc index d74a6f44e..3491027e9 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc @@ -26,6 +26,10 @@ #include "sanitizer_symbolizer_internal.h" #include "sanitizer_symbolizer_libbacktrace.h" #include "sanitizer_symbolizer_mac.h" +#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR + +#define TOSTR2(X) #X +#define TOSTR(X) TOSTR2(X) #include // for dlsym() #include @@ -481,7 +485,7 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) { return new(*allocator) AtosSymbolizer(found_path, allocator); } #endif // SANITIZER_MAC - if (const char *found_path = FindPathToBinary("llvm-symbolizer")) { + if (const char *found_path = "/usr/bin/llvm-symbolizer-" TOSTR(LLVM_VERSION_MAJOR)) { VReport(2, "Using llvm-symbolizer found at: %s\n", found_path); return new(*allocator) LLVMSymbolizer(found_path, allocator); } -- 2.30.2