Skip to content

fix extra $PATH entry for OCaml to use opam/default rather than opam/system #3390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boegel merged 3 commits into from
Aug 14, 2024
Merged

fix extra $PATH entry for OCaml to use opam/default rather than opam/system #3390

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40a9c2f
change extra path for OCaml
branfosj Jul 10, 2024
bc7fa88
enhance sanity check
branfosj Jul 31, 2024
b7f8bb5
Merge branch 'easybuilders:develop' into develop
branfosj Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions easybuild/easyblocks/o/ocaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,21 @@ def sanity_check_step(self):
binaries.append('bin/opam')
dirs.append(OPAM_SUBDIR)

extension_names = [ext_name for ext_name, _ in self.cfg['exts_list']]

custom_commands = ["ocaml --help"]
if 'ocamlfind' in extension_names:
custom_commands.append("ocamlfind list")

if 'dune' in extension_names:
custom_commands.append("dune --version")

custom_paths = {
'files': binaries,
'dirs': dirs,
}

super(EB_OCaml, self).sanity_check_step(custom_paths=custom_paths)
super(EB_OCaml, self).sanity_check_step(custom_paths=custom_paths, custom_commands=custom_commands)

def make_module_req_guess(self):
"""Custom extra paths/variables to define in generated module for OCaml."""
Expand All @@ -160,7 +169,7 @@ def make_module_req_guess(self):
guesses.update({
'CAML_LD_LIBRARY_PATH': ['lib'],
'OPAMROOT': [OPAM_SUBDIR],
'PATH': ['bin', os.path.join(OPAM_SUBDIR, 'system', 'bin')],
'PATH': ['bin', os.path.join(OPAM_SUBDIR, 'default', 'bin')],
})

return guesses