From ff540b2b06067f68d815d6021bf554fda6302a7c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 17 Sep 2015 08:39:02 +0000 Subject: [PATCH] rebase of the patch --- debian/patches/scan-build-clang-path.diff | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 6fea9a43..d5a9659f 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -1,13 +1,13 @@ -Index: llvm-toolchain-snapshot_3.8~svn247513/clang/tools/scan-build/scan-build +Index: llvm-toolchain-snapshot_3.8~svn247876/clang/tools/scan-build/scan-build =================================================================== ---- llvm-toolchain-snapshot_3.8~svn247513.orig/clang/tools/scan-build/scan-build -+++ llvm-toolchain-snapshot_3.8~svn247513/clang/tools/scan-build/scan-build -@@ -1644,7 +1644,7 @@ if (!@ARGV and !$RequestDisplayHelp) { +--- llvm-toolchain-snapshot_3.8~svn247876.orig/clang/tools/scan-build/scan-build ++++ llvm-toolchain-snapshot_3.8~svn247876/clang/tools/scan-build/scan-build +@@ -1405,7 +1405,7 @@ sub ShellEscape { - # Find 'clang' - if (!defined $Options{AnalyzerDiscoveryMethod}) { -- $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); -+ $Clang = Cwd::realpath("/usr/lib/llvm-3.8/bin/clang") if (-f "/usr/lib/llvm-3.8/bin/clang"); - if (!defined $Clang || ! -x $Clang) { - $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang"); - } + sub FindClang { + if (!defined $Options{AnalyzerDiscoveryMethod}) { +- $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-3.8/bin/clang") if (-f "$RealBin/bin/clang"); + if (!defined $Clang || ! -x $Clang) { + $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang"); + }