|
 |
6f28841 |
From 62eaebcb6bb872830299efa3f87506f1d23ef366 Mon Sep 17 00:00:00 2001
|
|
|
6f28841 |
From: serge-sans-paille <sguelton@redhat.com>
|
|
|
6f28841 |
Date: Mon, 13 Sep 2021 10:25:45 +0200
|
|
|
6f28841 |
Subject: [PATCH][clang] Fix scan-build-py executable lookup path
|
|
|
6f28841 |
|
|
|
6f28841 |
Once installed, scan-build-py doesn't know anything about its auxiliary
|
|
|
6f28841 |
executable and can't find them.
|
|
|
6f28841 |
Use relative path wrt. scan-build-py script.
|
|
|
6f28841 |
|
|
|
6f28841 |
Differential Revision: https://reviews.llvm.org/D109659
|
|
|
6f28841 |
|
|
|
6f28841 |
(cherry picked from commit c84755a046bbdcd0564693e30b2508034b06002b)
|
|
|
6f28841 |
---
|
|
|
6f28841 |
clang/tools/scan-build-py/lib/libscanbuild/analyze.py | 6 ++++--
|
|
|
6f28841 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
6f28841 |
|
|
|
6f28841 |
diff --git a/clang/tools/scan-build-py/lib/libscanbuild/analyze.py b/clang/tools/scan-build-py/lib/libscanbuild/analyze.py
|
|
|
6f28841 |
index 9a249a8..d83ff2a 100644
|
|
|
6f28841 |
--- a/clang/tools/scan-build-py/lib/libscanbuild/analyze.py
|
|
|
6f28841 |
+++ b/clang/tools/scan-build-py/lib/libscanbuild/analyze.py
|
|
|
6f28841 |
@@ -39,8 +39,10 @@ from libscanbuild.shell import decode
|
|
|
6f28841 |
|
|
|
6f28841 |
__all__ = ['scan_build', 'analyze_build', 'analyze_compiler_wrapper']
|
|
|
6f28841 |
|
|
|
6f28841 |
-COMPILER_WRAPPER_CC = 'analyze-cc'
|
|
|
6f28841 |
-COMPILER_WRAPPER_CXX = 'analyze-c++'
|
|
|
6f28841 |
+scanbuild_dir = os.path.dirname(__import__('sys').argv[0])
|
|
|
6f28841 |
+
|
|
|
6f28841 |
+COMPILER_WRAPPER_CC = os.path.join(scanbuild_dir, '..', 'libexec', 'analyze-cc')
|
|
|
6f28841 |
+COMPILER_WRAPPER_CXX = os.path.join(scanbuild_dir, '..', 'libexec', 'analyze-c++')
|
|
|
6f28841 |
|
|
|
6f28841 |
CTU_EXTDEF_MAP_FILENAME = 'externalDefMap.txt'
|
|
|
6f28841 |
CTU_TEMP_DEFMAP_FOLDER = 'tmpExternalDefMaps'
|
|
|
6f28841 |
--
|
|
|
6f28841 |
1.8.3.1
|
|
|
6f28841 |
|