[clang][scan-build] Mirror CCC_{CC,CXX} behaviour for CLANG{,_CXX}

rafl · rafl · commit 805396fa1ec1 · 2025-03-21T07:31:19.000-07:00
diff --git a/clang/tools/scan-build/libexec/ccc-analyzer b/clang/tools/scan-build/libexec/ccc-analyzer
@@ -78,7 +78,7 @@ sub DetermineClang {
   my ($is_cxx) = @_;
   my $default = $is_cxx ? 'clang++' : 'clang';
   my $opt = $ENV{$is_cxx ? 'CLANG_CXX' : 'CLANG'};
-  return !defined $opt || !-x $opt ? $default : $opt;
+  return defined $opt ? $opt : $default;
 }
 
 my $IsCXX = $FindBin::Script =~ /c\+\+-analyzer/;

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ sub DetermineClang {`
`78`	`78`	`my ($is_cxx) = @_;`
`79`	`79`	`my $default = $is_cxx ? 'clang++' : 'clang';`
`80`	`80`	`my $opt = $ENV{$is_cxx ? 'CLANG_CXX' : 'CLANG'};`
`81`		`- return !defined $opt \|\| !-x $opt ? $default : $opt;`
	`81`	`+ return defined $opt ? $opt : $default;`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`my $IsCXX = $FindBin::Script =~ /c\+\+-analyzer/;`