Clean up backported commits slightly

diff --git a/src/ccache.c b/src/ccache.c
index 32366eaf20454e6a18bf36f7233710f4420289b5..0e66468f2facdabc7172dab05cab0bb037dba450 100644 (file)
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -2756,7 +2756,8 @@ cc_process_args(struct args *args,
                }
 
                // when using nvcc with separable compilation, -dc implies -c
-               if ((str_eq(argv[i], "-dc") || str_eq(argv[i], "--device-c")) && guessed_compiler == GUESSED_NVCC) {
+               if ((str_eq(argv[i], "-dc") || str_eq(argv[i], "--device-c"))
+                   && guessed_compiler == GUESSED_NVCC) {
                        found_dc_opt = true;
                        continue;
                }

diff --git a/src/language.c b/src/language.c
index 1dbf962085f011e1f03500a0e96d5be54f49684e..f97ca44101bd834422644a1c4b28268696c90f24 100644 (file)
--- a/src/language.c
+++ b/src/language.c
@@ -1,6 +1,4 @@
-// Copyright (C) 2010-2019 Joel Rosdahl and other contributors
-//
-// See doc/AUTHORS.adoc for a complete list of contributors.
+// Copyright (C) 2010-2019 Joel Rosdahl
 //
 // 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

diff --git a/test/suites/nvcc.bash b/test/suites/nvcc.bash
index 3ee5c31785fc252780838e0708b8e47f933fa606..c121a5774d3089b9cec336db30fed796079c137a 100644 (file)
--- a/test/suites/nvcc.bash
+++ b/test/suites/nvcc.bash
@@ -127,10 +127,10 @@ nvcc_tests() {
     expect_stat 'files in cache' 3
     $cuobjdump test_cuda.o > test1.dump
     expect_equal_files reference_test3.dump test1.dump
-    
+
     # -------------------------------------------------------------------------
     TEST "Option -dc"
-    
+
     $REAL_NVCC $nvcc_opts_cuda -dc -o reference_test4.o test_cuda.cu
     $cuobjdump reference_test4.o > reference_test4.dump