[clang] [scan-build-py] use explicit compiler wrapper paths for intercept (PR #123252)
via cfe-commits
cfe-commits at lists.llvm.org
Thu Jan 16 15:07:51 PST 2025
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang
Author: Aymeric Wibo (obiwac)
<details>
<summary>Changes</summary>
Previously, when using compiler wrappers (`--override-compiler`, as is default on macOS with SIP on), CC/CXX were set to just `intercept-cc/c++`, which are installed to libexec (so a priori not in PATH).
This PR mirrors what's done in `analyze-build`, and sets those to explicit paths to `intercept-cc/c++`.
---
Full diff: https://github.com/llvm/llvm-project/pull/123252.diff
1 Files Affected:
- (modified) clang/tools/scan-build-py/lib/libscanbuild/intercept.py (+5-2)
``````````diff
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"})
``````````
</details>
https://github.com/llvm/llvm-project/pull/123252
More information about the cfe-commits
mailing list