From bd0d2c6ff85b4e743dd6dc86d0bafa847fccd89f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 18 Feb 2014 17:45:06 +0000 Subject: [PATCH] In some cases (for example, the Firefox build system), the CLANG_CXX variable is defined but empty. Extend the test (like it is done in scan-build) to check also if the variable is empty or not. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201586 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/scan-build/ccc-analyzer | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/scan-build/ccc-analyzer b/tools/scan-build/ccc-analyzer index 6884162bb0..4dedc2f657 100755 --- a/tools/scan-build/ccc-analyzer +++ b/tools/scan-build/ccc-analyzer @@ -41,19 +41,19 @@ if (`uname -a` =~ m/Darwin/) { if ($FindBin::Script =~ /c\+\+-analyzer/) { $Compiler = $ENV{'CCC_CXX'}; - if (!defined $Compiler) { $Compiler = $DefaultCXXCompiler; } + if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCXXCompiler; } $Clang = $ENV{'CLANG_CXX'}; - if (!defined $Clang) { $Clang = 'clang++'; } + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } $IsCXX = 1 } else { $Compiler = $ENV{'CCC_CC'}; - if (!defined $Compiler) { $Compiler = $DefaultCCompiler; } + if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCCompiler; } $Clang = $ENV{'CLANG'}; - if (!defined $Clang) { $Clang = 'clang'; } + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } $IsCXX = 0 } -- 2.49.0