[cfe-commits] r65483 - /cfe/trunk/utils/scan-build

[Ted Kremenek]

Author: kremenek
Date: Wed Feb 25 16:54:02 2009
New Revision: 65483

URL: http://llvm.org/viewvc/llvm-project?rev=65483&view=rev
Log:
scan-build now looks for ccc-analyzer first in the 'bin' subdirectory and then the directory where scan-build lives.

Modified:
    cfe/trunk/utils/scan-build

Modified: cfe/trunk/utils/scan-build
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/scan-build?rev=65483&r1=65482&r2=65483&view=diff

==============================================================================
--- cfe/trunk/utils/scan-build (original)
+++ cfe/trunk/utils/scan-build Wed Feb 25 16:54:02 2009
@@ -1149,10 +1149,11 @@
 # Set the appropriate environment variables.
 SetHtmlEnv(\@ARGV, $HtmlDir);
 
-my $Cmd = Cwd::realpath("$RealBin/ccc-analyzer");
-
-DieDiag("Executable 'ccc-analyzer' does not exist at '$Cmd'\n")
-  if (! -x $Cmd);
+my $Cmd = Cwd::realpath("$RealBin/bin/ccc-analyzer");
+if (!defined $Cmd || ! -x $Cmd) {
+  $Cmd = Cwd::realpath("$RealBin/ccc-analyzer");
+  DieDiag("Executable 'ccc-analyzer' does not exist at '$Cmd'\n");
+}
 
 if (!defined $ClangSB || ! -x $ClangSB) {
   Diag("'clang' executable not found in '$RealBin/bin'.\n");