From: Ted Kremenek Date: Tue, 24 Mar 2009 04:29:13 +0000 (+0000) Subject: Update scan-build/ccc-analyzer to use 'clang-cc' instead of 'clang'. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=318e6a65ff6105b0121b49dfc9d47363843a1185;p=clang 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 1be5355df4..09f7824e7b 100755 --- 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 1aad3ef118..e412a1f5fd 100755 --- 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) {