Merge pull request #4088 from casparvl/skip_fortran_wrappers_clang

Fix trying to generate RPATH wrappers for Clang

Author: boegel

easybuild/tools/toolchain/toolchain.py

@@ -988,6 +988,9 @@ def prepare_rpath_wrappers(self, rpath_filter_dirs=None, rpath_include_dirs=None
 
         # create wrappers
         for cmd in nub(c_comps + fortran_comps + ['ld', 'ld.gold', 'ld.bfd']):
+            # Not all toolchains have fortran compilers (e.g. Clang), in which case they are 'None'
+            if cmd is None:
+                continue
             orig_cmd = which(cmd)
 
             if orig_cmd:

test/framework/toolchain.py

@@ -56,6 +56,7 @@
 from easybuild.tools.toolchain.mpi import get_mpi_cmd_template
 from easybuild.tools.toolchain.toolchain import env_vars_external_module
 from easybuild.tools.toolchain.utilities import get_toolchain, search_toolchain
+from easybuild.toolchains.compiler.clang import Clang
 
 easybuild.tools.toolchain.compiler.systemtools.get_compiler_family = lambda: st.POWER
 
@@ -2617,6 +2618,26 @@ def test_toolchain_prepare_rpath(self):
         # any other available 'g++' commands should not be a wrapper or our fake g++
         self.assertFalse(any(os.path.samefile(x, fake_gxx) for x in res[2:]))
 
+        # Check that we can create a wrapper for a toolchain for which self.compilers() returns 'None' for the Fortran
+        # compilers (i.e. Clang)
+        fake_clang = os.path.join(self.test_prefix, 'fake', 'clang')
+        write_file(fake_clang, '#!/bin/bash\necho "$@"')
+        adjust_permissions(fake_clang, stat.S_IXUSR)
+        tc_clang = Clang(name='Clang', version='1')
+        tc_clang.prepare_rpath_wrappers()
+
+        # Check that the clang wrapper is indeed in place
+        res = which('clang', retain_all=True)
+        # there should be at least 2 hits: the RPATH wrapper, and our fake 'clang' command (there may be real ones too)
+        self.assertTrue(len(res) >= 2)
+        self.assertTrue(tc_clang.is_rpath_wrapper(res[0]))
+        self.assertEqual(os.path.basename(res[0]), 'clang')
+        self.assertEqual(os.path.basename(os.path.dirname(res[0])), 'clang_wrapper')
+        self.assertFalse(any(tc_clang.is_rpath_wrapper(x) for x in res[1:]))
+        self.assertTrue(os.path.samefile(res[1], fake_clang))
+        # any other available 'clang' commands should not be a wrapper or our fake clang
+        self.assertFalse(any(os.path.samefile(x, fake_clang) for x in res[2:]))
+
         # RPATH wrapper should be robust against Python environment variables & site-packages magic,
         # so we set up a weird environment here to verify that
         # (see https://github.com/easybuilders/easybuild-framework/issues/3421)