Merge pull request #2765 from easybuilders/ocaisa-patch-1

make `$LD_LIBRARY_PATH` detection more robust for LAMMPS

easybuild/easyblocks/l/lammps.py

@@ -454,9 +454,9 @@ def sanity_check_step(self, *args, **kwargs):
         # Requires liblammps.so to be findable by the runtime linker (which it might not be if using
         # rpath and filtering out LD_LIBRARY_PATH)
         set_ld_library_path = ''
-        if 'LD_LIBRARY_PATH' not in os.environ:
+        if self.installdir not in os.getenv('LD_LIBRARY_PATH', default=''):
             # Use LIBRARY_PATH to set it
-            set_ld_library_path = "LD_LIBRARY_PATH=$LIBRARY_PATH "
+            set_ld_library_path = "LD_LIBRARY_PATH=$LIBRARY_PATH:$LD_LIBRARY_PATH "
         custom_commands = ["cd %s && " % execution_dir + set_ld_library_path + cmd for cmd in custom_commands]
 
         shlib_ext = get_shared_lib_ext()