From a9dc600dffddd060fff00cfce6c3b7c76af89046 Mon Sep 17 00:00:00 2001 From: Jonathan Roelofs Date: Mon, 29 Jan 2018 16:37:53 +0000 Subject: [PATCH] [analyzer] Fix -x language argument for C preprocessed sources clang's -x option doesn't accept c-cpp-output as a language (even though 463eb6ab was merged, the driver still doesn't handle that). This bug prevents testing C language projects when ccache is used. Fixes #25851. Investigation and patch by Dave Rigby. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@323664 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/scan-build/libexec/ccc-analyzer | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scan-build/libexec/ccc-analyzer b/tools/scan-build/libexec/ccc-analyzer index b0ec7e7e74..73cd2ff3d9 100755 --- a/tools/scan-build/libexec/ccc-analyzer +++ b/tools/scan-build/libexec/ccc-analyzer @@ -419,7 +419,7 @@ my %LangMap = ( 'cc' => 'c++', 'C' => 'c++', 'ii' => 'c++-cpp-output', - 'i' => $IsCXX ? 'c++-cpp-output' : 'c-cpp-output', + 'i' => $IsCXX ? 'c++-cpp-output' : 'cpp-output', 'm' => 'objective-c', 'mi' => 'objective-c-cpp-output', 'mm' => 'objective-c++', @@ -439,7 +439,7 @@ my %LangsAccepted = ( "c" => 1, "c++" => 1, "objective-c++" => 1, - "c-cpp-output" => 1, + "cpp-output" => 1, "objective-c-cpp-output" => 1, "c++-cpp-output" => 1 ); -- 2.40.0