rebase of the patch

This commit is contained in:
Sylvestre Ledru 2019-03-17 09:53:45 +01:00
parent 9952e77f7e
commit 54c1e72c53

View File

@ -2,16 +2,16 @@
clang/tools/scan-build/bin/scan-build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: llvm-toolchain-snapshot_9~svn349139/clang/tools/scan-build/bin/scan-build
Index: llvm-toolchain-snapshot_9~svn356328/clang/tools/scan-build/bin/scan-build
===================================================================
--- llvm-toolchain-snapshot_9~svn349139.orig/clang/tools/scan-build/bin/scan-build
+++ llvm-toolchain-snapshot_9~svn349139/clang/tools/scan-build/bin/scan-build
@@ -1469,7 +1469,7 @@ sub FindClang {
--- llvm-toolchain-snapshot_9~svn356328.orig/clang/tools/scan-build/bin/scan-build
+++ llvm-toolchain-snapshot_9~svn356328/clang/tools/scan-build/bin/scan-build
@@ -1477,7 +1477,7 @@ sub FindClang {
if (!defined $Options{AnalyzerDiscoveryMethod}) {
$Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
if (!defined $Clang || ! -x $Clang) {
- $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-9/bin/clang");
}
if (!defined $Clang || ! -x $Clang) {
return "error: Cannot find an executable 'clang' relative to" .
if (!defined $Clang || ! -x $Clang) {
# When an Xcode toolchain is present, look for a clang in the sibling bin
# of the parent of the bin directory. So if scan-build is at