From 2f041e62626047361e3fd102b1e5f2233d652b68 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Mon, 23 Mar 2020 10:59:23 +0000 Subject: [PATCH] clang-analyzer-force-version # Force the version of clang in the analyzer # This was causing the static analyzer to fail silently if the clang & clang++ are # not installed Gbp-Pq: Name clang-analyzer-force-version.diff --- clang/tools/scan-build/libexec/ccc-analyzer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/tools/scan-build/libexec/ccc-analyzer b/clang/tools/scan-build/libexec/ccc-analyzer index b0ec7e7e..a005d439 100755 --- a/clang/tools/scan-build/libexec/ccc-analyzer +++ b/clang/tools/scan-build/libexec/ccc-analyzer @@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/) { if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } $Clang = $ENV{'CLANG_CXX'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-6.0'; } $IsCXX = 1 } @@ -100,7 +100,7 @@ else { if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; } $Clang = $ENV{'CLANG'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-6.0'; } $IsCXX = 0 } -- 2.30.2