Merge pull request #1904 from ComputeCanada/icc-no-library-cpath

iccifort: remove LIBRARY_PATH entries already known to icc et al

Author: boegel

easybuild/easyblocks/i/iccifort.py

@@ -31,6 +31,7 @@
 @author: Bart Oldeman (McGill University, Compute Canada)
 """
 
+import os
 from easybuild.easyblocks.icc import EB_icc
 from easybuild.easyblocks.ifort import EB_ifort
 
@@ -61,4 +62,13 @@ def make_module_req_guess(self):
         # including it causes problems, e.g. with complex.h and std::complex
         # cfr. https://software.intel.com/en-us/forums/intel-c-compiler/topic/338378
         # whereas EB_ifort adds 'include' but that's only needed if icc and ifort are separate
-        return EB_icc.make_module_req_guess(self)
+        guesses = EB_icc.make_module_req_guess(self)
+
+        # remove entries from LIBRARY_PATH that icc and co already know about at compile time
+        # only do this for iccifort merged installations so that icc can still find ifort
+        # libraries and vice versa for split installations
+        if self.comp_libs_subdir is not None:
+            compiler_library_paths = [os.path.join(self.comp_libs_subdir, p)
+                                      for p in ('lib', 'compiler/lib/intel64', 'lib/ia32', 'lib/intel64')]
+            guesses['LIBRARY_PATH'] = [p for p in guesses['LIBRARY_PATH'] if p not in compiler_library_paths]
+        return guesses