Update scan-build/ccc-analyzer to use 'clang-cc' instead of 'clang'.

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

diff --git a/utils/ccc-analyzer b/utils/ccc-analyzer
index 1be5355df47a551ce3a44ae65e93afe5cdb5f59b..09f7824e7bae05b31a12ddb980b6216a70e084f2 100755 (executable)
--- a/utils/ccc-analyzer
+++ b/utils/ccc-analyzer
@@ -332,7 +332,7 @@ if (defined $ENV{CCC_ANALYZER_LOG}) { $Verbose = 2; }
 
 # Determine what clang executable to use.
 my $Clang = $ENV{'CLANG'};
-if (!defined $Clang) { $Clang = 'clang'; }
+if (!defined $Clang) { $Clang = 'clang-cc'; }
 
 # Get the HTML output directory.
 my $HtmlDir = $ENV{'CCC_ANALYZER_HTML'};

diff --git a/utils/scan-build b/utils/scan-build
index 1aad3ef118680dcc2b7f78488b5dd8f01b3ad19f..e412a1f5fd96a63aff9179d0b57c7ce67db9c59d 100755 (executable)
--- a/utils/scan-build
+++ b/utils/scan-build
@@ -81,17 +81,17 @@ sub DieDiag {
 # Some initial preprocessing of Clang options.
 ##----------------------------------------------------------------------------##
 
-my $ClangSB = Cwd::realpath("$RealBin/bin/clang");
+my $ClangSB = Cwd::realpath("$RealBin/bin/clang-cc");
 
 # Also look for 'clang' in the same directory as scan-build.
 if (!defined $ClangSB || ! -x $ClangSB) {
-  $ClangSB = Cwd::realpath("$RealBin/clang");
+  $ClangSB = Cwd::realpath("$RealBin/clang-cc");
 }
 
 my $Clang = $ClangSB;
 
 if (!defined $ClangSB || ! -x $ClangSB) {
-  $Clang = "clang";
+  $Clang = "clang-cc";
 }
 
 my %AvailableAnalyses;
@@ -1165,8 +1165,8 @@ if (!defined $Cmd || ! -x $Cmd) {
 }
 
 if (!defined $ClangSB || ! -x $ClangSB) {
-  Diag("'clang' executable not found in '$RealBin/bin'.\n");
-  Diag("Using 'clang' from path.\n");
+  Diag("'clang-cc' executable not found in '$RealBin/bin'.\n");
+  Diag("Using 'clang-cc' from path.\n");
 }
 
 if (defined $CXX) {