aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xutils/scan-build9
1 files changed, 5 insertions, 4 deletions
diff --git a/utils/scan-build b/utils/scan-build
index 6d43c3c962..ec5f830274 100755
--- a/utils/scan-build
+++ b/utils/scan-build
@@ -1149,10 +1149,11 @@ $HtmlDir = GetHTMLRunDir($HtmlDir);
# Set the appropriate environment variables.
SetHtmlEnv(\@ARGV, $HtmlDir);
-my $Cmd = Cwd::realpath("$RealBin/ccc-analyzer");
-
-DieDiag("Executable 'ccc-analyzer' does not exist at '$Cmd'\n")
- if (! -x $Cmd);
+my $Cmd = Cwd::realpath("$RealBin/bin/ccc-analyzer");
+if (!defined $Cmd || ! -x $Cmd) {
+ $Cmd = Cwd::realpath("$RealBin/ccc-analyzer");
+ DieDiag("Executable 'ccc-analyzer' does not exist at '$Cmd'\n");
+}
if (!defined $ClangSB || ! -x $ClangSB) {
Diag("'clang' executable not found in '$RealBin/bin'.\n");