[llvm-branch-commits] [cfe-tag] r95426 - /cfe/tags/checker/checker-233/tools/scan-build/scan-build

[Ted Kremenek]

Author: kremenek
Date: Fri Feb  5 14:35:51 2010
New Revision: 95426

URL: http://llvm.org/viewvc/llvm-project?rev=95426&view=rev
Log:
Merge in r95425.

Modified:
    cfe/tags/checker/checker-233/tools/scan-build/scan-build

Modified: cfe/tags/checker/checker-233/tools/scan-build/scan-build
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/checker/checker-233/tools/scan-build/scan-build?rev=95426&r1=95425&r2=95426&view=diff

==============================================================================
--- cfe/tags/checker/checker-233/tools/scan-build/scan-build (original)
+++ cfe/tags/checker/checker-233/tools/scan-build/scan-build Fri Feb  5 14:35:51 2010
@@ -82,18 +82,18 @@
 
 # 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;