Minor fixes

Author: Vasileios Karakasis

cscs-checks/libraries/math/trilinos_compile_run.py

@@ -58,17 +58,23 @@ def set_cxxflags(self):
     def cdt2006_workaround_intel(self):
         if (self.current_environ.name == 'PrgEnv-intel' and
             os_ext.cray_cdt_version() == '20.06'):
-                self.modules += ['cray-netcdf-hdf5parallel']
-                self.prebuild_cmds = [
-                    'ln -s $CRAY_NETCDF_HDF5PARALLEL_PREFIX/lib/pkgconfig/'
-                    'netcdf-cxx4_parallel.pc netcdf_c++4_parallel.pc']
-                self.variables['PKG_CONFIG_PATH'] = '.:$PKG_CONFIG_PATH'
+            self.modules += ['cray-netcdf-hdf5parallel']
+            self.prebuild_cmds = [
+                'ln -s $CRAY_NETCDF_HDF5PARALLEL_PREFIX/lib/pkgconfig/'
+                'netcdf-cxx4_parallel.pc netcdf_c++4_parallel.pc'
+            ]
+            self.variables['PKG_CONFIG_PATH'] = '.:$PKG_CONFIG_PATH'
 
     @rfm.run_before('compile')
     def cdt2006_workaround_dynamic(self):
         if (os_ext.cray_cdt_version() == '20.06' and
-            self.linkage == 'dynamic'):
-            self.variables['PATH'] = '/opt/cray/pe/cce/10.0.1/cce-clang/x86_64/bin:$PATH'
+            self.linkage == 'dynamic' and
+            self.current_environ.name == 'PrgEnv-gnu'):
+            self.variables['PATH'] = (
+                '/opt/cray/pe/cce/10.0.1/cce-clang/x86_64/bin:$PATH'
+            )
             self.prgenv_flags[self.current_environ.name] += ['-fuse-ld=lld']
-            if self.current_environ.name == 'PrgEnv-gnu':
-                self.modules += ['gcc/9.3.0']
+
+            # GCC >= 9 is required for the above option; our CUDA-friendly CDT
+            # uses GCC 8 as default.
+            self.modules += ['gcc/9.3.0']