From b3b514858e6363993c96330d12b1d431cc39c897 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Wed, 31 Jul 2019 21:06:21 +0200 Subject: Remove .ic extension and cuda/cuda-output languages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. (cherry picked from commit c4fffda031034f930df2cf188878b8f9160027df) --- src/ccache.c | 2 +- src/language.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ccache.c b/src/ccache.c index 2b437636..be7527c4 100644 --- a/src/ccache.c +++ b/src/ccache.c @@ -3442,7 +3442,7 @@ cc_process_args(struct args *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 3146c1f0..1dbf9620 100644 --- a/src/language.c +++ b/src/language.c @@ -1,4 +1,6 @@ -// Copyright (C) 2010-2018 Joel Rosdahl +// Copyright (C) 2010-2019 Joel Rosdahl and other contributors +// +// See doc/AUTHORS.adoc for a complete list of contributors. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -62,8 +64,7 @@ static const struct { {".HXX", "c++-header"}, {".tcc", "c++-header"}, {".TCC", "c++-header"}, - {".cu", "cuda"}, - {".ic", "cuda-output"}, + {".cu", "cu"}, {NULL, NULL} }; @@ -78,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"}, @@ -86,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} -- cgit v1.2.1