Merge pull request #3409 from boegel/ccache_gfortran

stop installing ccache wrapper for Fortran compiler

Author: akesandgren

easybuild/tools/toolchain/toolchain.py

@@ -824,8 +824,11 @@ def comp_cache_compilers(self, cache_tool):
         c_comps, fortran_comps = self.compilers()
 
         if cache_tool == CCACHE:
-            # recent versions of ccache (>=3.3) also support caching of Fortran compilations
-            comps = c_comps + fortran_comps
+            # some version of ccache support caching of Fortran compilations,
+            # but it doesn't work with Fortran modules (https://github.com/ccache/ccache/issues/342),
+            # and support was dropped in recent ccache versions;
+            # as a result, we only use ccache for C/C++ compilers
+            comps = c_comps
         elif cache_tool == F90CACHE:
             comps = fortran_comps
         else:
@@ -838,6 +841,8 @@ def comp_cache_compilers(self, cache_tool):
                 self.log.debug("Not caching compiler %s, it's already being cached", comp)
                 comps.remove(comp)
 
+        self.log.info("Using %s for these compiler commands: %s", cache_tool, ', '.join(comps))
+
         return comps
 
     def prepare_compiler_cache(self, cache_tool):

test/framework/toolchain.py

@@ -1433,9 +1433,17 @@ def test_compiler_cache(self):
             self.assertTrue(regex.search(out), "Pattern '%s' found in: %s" % (regex.pattern, out))
 
         # $CCACHE_DIR is defined by toolchain.prepare(), and should still be defined after running 'eb'
+        ccache_path = os.path.join(self.test_prefix, 'scripts', 'ccache')
         self.assertTrue(os.path.samefile(os.environ['CCACHE_DIR'], ccache_dir))
-        for comp in ['gcc', 'g++', 'gfortran']:
-            self.assertTrue(os.path.samefile(which(comp), os.path.join(self.test_prefix, 'scripts', 'ccache')))
+        for comp in ['gcc', 'g++']:
+            comp_path = which(comp)
+            self.assertTrue(comp_path)
+            self.assertTrue(os.path.samefile(comp_path, ccache_path))
+
+        # no ccache wrapper for gfortran when using ccache
+        # (ccache either doesn't support Fortran anymore, or support is spotty (trouble with Fortran modules))
+        gfortran_path = which('gfortran')
+        self.assertTrue(gfortran_path is None or not os.path.samefile(gfortran_path, ccache_path))
 
         # reset environment to get rid of ccache symlinks, but with ccache/f90cache mock scripts still in place
         os.environ['PATH'] = prepped_path_envvar