Fix how scan-build finds c++-analyzer to work with checker builds.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95425 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/scan-build/scan-build b/tools/scan-build/scan-build
index 985579f7346d5eaa78b24531f6ba389f2677135e..7f05de2394d9453df389dc44f3927aca525323c4 100755 (executable)
--- a/tools/scan-build/scan-build
+++ b/tools/scan-build/scan-build
@@ -82,18 +82,18 @@ sub DieDiag {
 
 # Find 'clang'
 my $ClangSB = Cwd::realpath("$RealBin/bin/clang");
-my $ClangCXXSB;
 if (!defined $ClangSB || ! -x $ClangSB) {
   $ClangSB = Cwd::realpath("$RealBin/clang");
-  if (defined $ClangSB) { $ClangCXXSB = $ClangSB . "++"; }
 }
-my $Clang = $ClangSB;
-my $ClangCXX = $ClangCXXSB;
-# Default to looking for 'clang' in the path.
-if (!defined $Clang || ! -x $Clang) {
+my $Clang;
+if (!defined $ClangSB || ! -x $ClangSB) {
+  # Default to looking for 'clang' in the path.
   $Clang = "clang";
-  $ClangCXX = "clang++";
 }
+else {
+  $Clang = $ClangSB;
+}
+my $ClangCXX = $Clang . "++";
 
 my %AvailableAnalyses;