mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-10-31 10:24:01 +00:00
25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
|
|
+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
|
|
@@ -25,6 +25,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 <dlfcn.h> // for dlsym()
|
|
#include <errno.h>
|
|
@@ -428,7 +432,7 @@ static SymbolizerTool *ChooseExternalSym
|
|
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);
|
|
}
|