Address PR comments (version 2)

Author: Theofilos Manitaras

cscs-checks/libraries/io/hdf5_compile_run.py

@@ -85,5 +85,4 @@ def cray_linker_workaround(self):
                 self.current_environ.name == 'PrgEnv-cray'):
             return
 
-        self.variables = {'LINKER_X86_64': '/usr/bin/ld',
-                          'LINKER_AARCH64': '/usr/bin/ld'}
+        self.variables = {'ALT_LINKER': '/usr/bin/ld'}

cscs-checks/libraries/io/netcdf_compile_run.py

@@ -92,5 +92,4 @@ def cray_linker_workaround(self):
                 self.current_environ.name == 'PrgEnv-cray'):
             return
 
-        self.variables = {'LINKER_X86_64': '/usr/bin/ld',
-                          'LINKER_AARCH64': '/usr/bin/ld'}
+        self.variables = {'ALT_LINKER': '/usr/bin/ld'}

cscs-checks/libraries/math/scalapack_compile_run.py

@@ -37,8 +37,7 @@ def cray_linker_workaround(self):
                 self.current_environ.name == 'PrgEnv-cray'):
             return
 
-        self.variables.update({'LINKER_X86_64': '/usr/bin/ld',
-                               'LINKER_AARCH64': '/usr/bin/ld'})
+        self.variables['ALT_LINKER'] = '/usr/bin/ld'
 
 
 @rfm.required_version('>=2.14')

cscs-checks/prgenv/helloworld.py

@@ -108,8 +108,7 @@ def cray_linker_workaround(self):
                 self.current_environ.name.startswith('PrgEnv-cray')):
             return
 
-        self.variables.update({'LINKER_X86_64': '/usr/bin/ld',
-                               'LINKER_AARCH64': '/usr/bin/ld'})
+        self.variables['ALT_LINKER'] = '/usr/bin/ld'
 
 
 @rfm.required_version('>=2.14')