Allow overriding clang demangler from properties (#6228)gh-10989

Specifically bpf uses group.bpf.demangler (gcc demangler)

This fix continues #6114.

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/compilers/clang.ts b/lib/compilers/clang.ts
index dab518bc7..73d14531e 100644
--- a/lib/compilers/clang.ts
+++ b/lib/compilers/clang.ts
@@ -55,10 +55,13 @@ export class ClangCompiler extends BaseCompiler {
     }
 
     constructor(info: PreliminaryCompilerInfo, env) {
-        // If a compiler-local llvm demangler exists - use it
-        const demanglerPath = path.join(path.dirname(info.exe), 'llvm-cxxfilt');
-        if (fs.existsSync(demanglerPath)) {
-            info.demangler = demanglerPath;
+        // By default use the compiler-local llvm demangler, but allow overriding from config
+        // (for bpf)
+        if (info.demangler === undefined) {
+            const demanglerPath = path.join(path.dirname(info.exe), 'llvm-cxxfilt');
+            if (fs.existsSync(demanglerPath)) {
+                info.demangler = demanglerPath;
+            }
         }
 
         super(info, env);