Set the location of ccc-analyzer to be the same directory as where scan-build

is located.

llvm-svn: 49397

1 files changed, 5 insertions, 4 deletions

diff --git a/clang/utils/scan-build b/clang/utils/scan-build
index 29ad085c484..b4efa7bb9c8 100755
--- a/clang/utils/scan-build
+++ b/clang/utils/scan-build
@@ -265,8 +265,6 @@ ENDTEXT
   print OUT "</table>\n</body></html>\n";  
   close(OUT);
   
-  print "$RealBin\n";
-  
   CopyJS($Dir);
 }
 
@@ -427,8 +425,11 @@ $HtmlDir = GetHTMLRunDir($HtmlDir);
 
 SetHtmlEnv(\@ARGV, $HtmlDir);
 
-my $Cmd = `which ccc-analyzer`;
-$Cmd =~ s/\015?\012//;
+my $Cmd = "$RealBin/ccc-analyzer";
+
+die "$Prog: Executable 'ccc-analyzer' does not exist at '$Cmd'\n"
+  if (! -x $Cmd);
+
 $ENV{'CC'} = $Cmd;
 
 if ($Verbose >= 2) {