Use 'clang' binary in the same dir as scan-build; if it isn't there use the one in the path

llvm-svn: 49933

1 files changed, 8 insertions, 0 deletions

diff --git a/clang/utils/scan-build b/clang/utils/scan-build
index 362cad2e266..99262e4e1ea 100755
--- a/clang/utils/scan-build
+++ b/clang/utils/scan-build
@@ -537,8 +537,16 @@ my $Cmd = "$RealBin/ccc-analyzer";
 
 die "$Prog: Executable 'ccc-analyzer' does not exist at '$Cmd'\n"
   if (! -x $Cmd);
+  
+my $Clang = "$RealBin/clang";
+
+if (! -x $Clang) {
+  print "$Prog: 'clang' executable not found in '$RealBin'.  Using 'clang' from path.\n";
+  $Clang = "clang";
+}
 
 $ENV{'CC'} = $Cmd;
+$ENV{'CLANG'} = $Clang;
 
 if ($Verbose >= 2) {
   $ENV{'CCC_ANALYZER_VERBOSE'} = 1;