scan-build now looks for ccc-analyzer first in the 'bin' subdirectory and then the directory where scan-build lives.

llvm-svn: 65483

1 files changed, 5 insertions, 4 deletions

diff --git a/clang/utils/scan-build b/clang/utils/scan-build
index 6d43c3c9626..ec5f830274f 100755
--- a/clang/utils/scan-build
+++ b/clang/utils/scan-build
@@ -1149,10 +1149,11 @@ $HtmlDir = GetHTMLRunDir($HtmlDir);
 # 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");