From 54c1e72c53ce329e0647a4289d1f572d2e5f96df Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 17 Mar 2019 09:53:45 +0100 Subject: [PATCH] rebase of the patch --- debian/patches/scan-build-clang-path.diff | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 2eccb0fa..46c5d71d 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -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