Merge branch 'master' into trilinos_static_fix

Author: Vasileios Karakasis

cscs-checks/libraries/io/netcdf_compile_run.py

@@ -6,6 +6,7 @@
 import os
 
 import reframe as rfm
+import reframe.utility.os_ext as os_ext
 import reframe.utility.sanity as sn
 
 
@@ -113,6 +114,14 @@ def setflags(self):
     def cray_linker_workaround(self):
         # NOTE: Workaround for using CCE < 9.1 in CLE7.UP01.PS03 and above
         # See Patch Set README.txt for more details.
-        if (self.current_system.name == 'dom' and
-            self.current_environ.name == 'PrgEnv-cray'):
+        cle = os_ext.cray_cle_info()
+        if not cle:
+            return
+
+        if (cle.release == '7.0.UP01' and cle.patchset >= '03'):
             self.variables['LINKER_X86_64'] = '/usr/bin/ld'
+
+    @rfm.run_before('run')
+    def cdt2006_cpp_workaround(self):
+        if (os_ext.cray_cdt_version() == '20.06' and self.lang == 'cpp'):
+            self.modules += ['cray-hdf5/1.10.6.1']