]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
Revert "Add back support for the “cuda” language"
authorJoel Rosdahl <joel@rosdahl.net>
Fri, 2 Aug 2019 18:36:32 +0000 (20:36 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Fri, 2 Aug 2019 18:36:32 +0000 (20:36 +0200)
This reverts commit 95b0dc5a76bff88ba420a62b7bf2e74e8ea7e300.

NVCC maps the “.cu” extension to “cu” but Clang maps it to “cuda”, so
it’s ambiguous. Let’s ignore the Clang case for now.

Related to PR #381.

src/ccache.c
src/language.c

index 0b96b56a060ab827698215f5377913989a04190a..ac3abb31ac39879990fc68f26dd9834d44c47eac 100644 (file)
@@ -3183,8 +3183,7 @@ cc_process_args(struct args *args, struct args **preprocessor_args,
                goto out;
        }
 
-       if (!conf->run_second_cpp
-           && (str_eq(actual_language, "cu") || 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;
        }
index d6a67b312332d34459a6b8c5ec74c3180b6717fe..1dbf962085f011e1f03500a0e96d5be54f49684e 100644 (file)
@@ -80,7 +80,6 @@ static const struct {
        {"c++-cpp-output",           "c++-cpp-output"},
        {"c++-header",               "c++-cpp-output"},
        {"cu",                       "cpp-output"},
-       {"cuda",                     "cpp-output"},
        {"objective-c",              "objective-c-cpp-output"},
        {"objective-c-header",       "objective-c-cpp-output"},
        {"objc-cpp-output",          "objective-c-cpp-output"},