make sure the top level fujitsu library dir is found by the rpath wrapper

Author: migueldiascosta

easybuild/toolchains/compiler/fujitsu.py

@@ -29,18 +29,22 @@
 
 :author: Miguel Dias Costa (National University of Singapore)
 """
+import os
+
+import easybuild.tools.environment as env
 import easybuild.tools.systemtools as systemtools
 from easybuild.tools.toolchain.compiler import Compiler, DEFAULT_OPT_LEVEL
 
 TC_CONSTANT_FUJITSU = 'Fujitsu'
+TC_CONSTANT_MODULE_NAME = 'lang'
+TC_CONSTANT_MODULE_VAR = 'FJSVXTCLANGA'
 
 
 class FujitsuCompiler(Compiler):
     """Generic support for using Fujitsu compiler drivers."""
     TOOLCHAIN_FAMILY = TC_CONSTANT_FUJITSU
 
-    # compiler module name is lang (with version e.g. tcsds-1.2.31)
-    COMPILER_MODULE_NAME = ['lang']
+    COMPILER_MODULE_NAME = [TC_CONSTANT_MODULE_NAME]
     COMPILER_FAMILY = TC_CONSTANT_FUJITSU
 
     # make sure fcc is always called in clang compatibility mode
@@ -82,6 +86,14 @@ class FujitsuCompiler(Compiler):
         (systemtools.AARCH64, systemtools.ARM): '-mcpu=generic -mtune=generic',
     }
 
+    def prepare(self, *args, **kwargs):
+        super(FujitsuCompiler, self).prepare(*args, **kwargs)
+
+        # make sure the fujitsu module libraries are found (and added to rpath by wrapper)
+        libdir = os.path.join(os.getenv(TC_CONSTANT_MODULE_VAR), 'lib64')
+        self.log.debug("Adding %s to $LIBRARY_PATH" % libdir)
+        env.setvar('LIBRARY_PATH', os.pathsep.join([os.getenv('LIBRARY_PATH'), libdir]))
+
     def _set_compiler_vars(self):
         super(FujitsuCompiler, self)._set_compiler_vars()
 

easybuild/toolchains/linalg/fujitsussl.py

@@ -29,12 +29,11 @@
 """
 import os
 
-
+from easybuild.toolchains.compiler.fujitsu import TC_CONSTANT_MODULE_NAME, TC_CONSTANT_MODULE_VAR
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.toolchain.constants import COMPILER_FLAGS
 from easybuild.tools.toolchain.linalg import LinAlg
 
-
 FUJITSU_SSL_MODULE_NAME = None
 TC_CONSTANT_FUJITSU_SSL = 'FujitsuSSL'
 
@@ -43,7 +42,7 @@ class FujitsuSSL(LinAlg):
     """Support for Fujitsu's SSL library, which provides BLAS/LAPACK support."""
     # BLAS/LAPACK support
     # via lang/tcsds module
-    BLAS_MODULE_NAME = ['lang']
+    BLAS_MODULE_NAME = [TC_CONSTANT_MODULE_NAME]
 
     # no need to specify libraries nor includes, only the compiler flags below
     BLAS_LIB = ['']
@@ -71,9 +70,8 @@ class FujitsuSSL(LinAlg):
 
     def _get_software_root(self, name):
         """Get install prefix for specified software name; special treatment for Fujitsu modules."""
-        if name == 'lang':
-            # Fujitsu-provided  module
-            env_var = 'FJSVXTCLANGA'
+        if name == TC_CONSTANT_MODULE_NAME:
+            env_var = TC_CONSTANT_MODULE_VAR
             root = os.getenv(env_var)
             if root is None:
                 raise EasyBuildError("Failed to determine install prefix for %s via $%s", name, env_var)