From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 31 Jul 2019 19:06:21 +0000 (+0200)
Subject: Remove .ic extension and cuda/cuda-output languages
X-Git-Tag: v4.0~860
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4fffda031034f930df2cf188878b8f9160027df;p=thirdparty%2Fccache.git

Remove .ic extension and cuda/cuda-output languages

CUDA/NVCC, at least not version 10.1, does not recognize “.ic” as a
valid extension and neither “cuda” nor “cuda-output” as languages.

Also made sure to compare with “cu” instead of “cuda” when detecting
whether to force run_second_cpp.
---

diff --git a/src/ccache.c b/src/ccache.c
index d87c53b9f..ac3abb31a 100644
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -3183,7 +3183,7 @@ cc_process_args(struct args *args, struct args **preprocessor_args,
 		goto out;
 	}
 
-	if (!conf->run_second_cpp && str_eq(actual_language, "cuda")) {
+	if (!conf->run_second_cpp && str_eq(actual_language, "cu")) {
 		cc_log("Using CUDA compiler; not compiling preprocessed code");
 		conf->run_second_cpp = true;
 	}
diff --git a/src/language.c b/src/language.c
index 7a3404dd6..1dbf96208 100644
--- a/src/language.c
+++ b/src/language.c
@@ -1,4 +1,4 @@
-// Copyright (C) 2010-2018 Joel Rosdahl and other contributors
+// Copyright (C) 2010-2019 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -64,8 +64,7 @@ static const struct {
 	{".HXX", "c++-header"},
 	{".tcc", "c++-header"},
 	{".TCC", "c++-header"},
-	{".cu",  "cuda"},
-	{".ic",  "cuda-output"},
+	{".cu",  "cu"},
 	{NULL,  NULL}
 };
 
@@ -80,6 +79,7 @@ static const struct {
 	{"c++",                      "c++-cpp-output"},
 	{"c++-cpp-output",           "c++-cpp-output"},
 	{"c++-header",               "c++-cpp-output"},
+	{"cu",                       "cpp-output"},
 	{"objective-c",              "objective-c-cpp-output"},
 	{"objective-c-header",       "objective-c-cpp-output"},
 	{"objc-cpp-output",          "objective-c-cpp-output"},
@@ -88,8 +88,6 @@ static const struct {
 	{"objc++-cpp-output",        "objective-c++-cpp-output"},
 	{"objective-c++-header",     "objective-c++-cpp-output"},
 	{"objective-c++-cpp-output", "objective-c++-cpp-output"},
-	{"cu"  ,                     "cuda-output"},
-	{"cuda",                     "cuda-output"},
 	{"assembler-with-cpp",       "assembler"},
 	{"assembler",                "assembler"},
 	{NULL,  NULL}