Find 'clang' in 'bin' subdirectory instead of 'cbin'.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65343 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 3 deletions

diff --git a/utils/scan-build b/utils/scan-build
index 0ff0b2be72..f1fbb55729 100755
--- a/utils/scan-build
+++ b/utils/scan-build
@@ -81,7 +81,7 @@ sub DieDiag {
 # Some initial preprocessing of Clang options.
 ##----------------------------------------------------------------------------##
 
-my $ClangSB = Cwd::realpath("$RealBin/cbin/clang");
+my $ClangSB = Cwd::realpath("$RealBin/bin/clang");
 my $Clang = $ClangSB;
 
 if (!defined $ClangSB || ! -x $ClangSB) {
@@ -1150,8 +1150,8 @@ my $Cmd = Cwd::realpath("$RealBin/ccc-analyzer");
 DieDiag("Executable 'ccc-analyzer' does not exist at '$Cmd'\n")
   if (! -x $Cmd);
 
-if (! -x $ClangSB) {
-  Diag("'clang' executable not found in '$RealBin/cbin'.\n");
+if (!defined $ClangSB || ! -x $ClangSB) {
+  Diag("'clang' executable not found in '$RealBin/bin'.\n");
   Diag("Using 'clang' from path.\n");
 }