[clang] [scan-build-py] use explicit compiler wrapper paths for intercept (PR #123252)

Aymeric Wibo via cfe-commits cfe-commits at lists.llvm.org
Thu Jan 16 15:08:27 PST 2025


https://github.com/obiwac updated https://github.com/llvm/llvm-project/pull/123252

>From 11fcbaaba06ebce33f20cc862e8475736c1e046b Mon Sep 17 00:00:00 2001
From: Aymeric Wibo <obiwac at gmail.com>
Date: Fri, 17 Jan 2025 00:01:25 +0100
Subject: [PATCH] [scan-build-py] use explicit compiler wrapper paths for
 intercept

---
 clang/tools/scan-build-py/lib/libscanbuild/intercept.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/clang/tools/scan-build-py/lib/libscanbuild/intercept.py b/clang/tools/scan-build-py/lib/libscanbuild/intercept.py
index 59789f6001f4f7..95efb75a57fe01 100644
--- a/clang/tools/scan-build-py/lib/libscanbuild/intercept.py
+++ b/clang/tools/scan-build-py/lib/libscanbuild/intercept.py
@@ -46,8 +46,11 @@
 RS = chr(0x1E)
 US = chr(0x1F)
 
-COMPILER_WRAPPER_CC = "intercept-cc"
-COMPILER_WRAPPER_CXX = "intercept-c++"
+scanbuild_dir = os.path.dirname(os.path.realpath(__import__("sys").argv[0]))
+
+COMPILER_WRAPPER_CC = os.path.join(scanbuild_dir, "..", "libexec", "intercept-cc")
+COMPILER_WRAPPER_CXX = os.path.join(scanbuild_dir, "..", "libexec", "intercept-c++")
+
 TRACE_FILE_EXTENSION = ".cmd"  # same as in ear.c
 WRAPPER_ONLY_PLATFORMS = frozenset({"win32", "cygwin"})
 



More information about the cfe-commits mailing list