Skip to content

check if ld wrappers are actually available in post_prepare_hook_gcc_prefixed_ld_rpath_wrapper #141

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

Open
bedroge wants to merge 4 commits into
base: main
Choose a base branch
from
Open

check if ld wrappers are actually available in post_prepare_hook_gcc_prefixed_ld_rpath_wrapper #141

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4bca65
check if ld wrappers are actually available
bedroge Dec 19, 2025
ac4be2f
only allow missing ld.gold, print an error for other missing wrappers
bedroge Dec 19, 2025
cc39efb
add fix for RISC-V unknown vs pc system type
bedroge Dec 19, 2025
220665d
Merge branch 'main' into no_ld.gold_fix
bedroge Dec 22, 2025
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
19 changes: 19 additions & 0 deletions eb_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,27 @@ def post_prepare_hook_gcc_prefixed_ld_rpath_wrapper(self, *args, **kwargs):
config_guess = obtain_config_guess()
system_type, _ = run_cmd(config_guess, log_all=True)
cmd_prefix = '%s-' % system_type.strip()
if cmd_prefix.startswith('riscv64-unknown-'):
# The 2025.06 compatibility layer for RISC-V is built with CHOST=riscv64-pc-linux-gnu,
# while config.guess returns riscv64-unknown-linux-gnu.
# If we can't find an ld with the original cmd_prefix, but can find one with the -pc- prefix,
# we simply override the original cmd_prefix.
eprefix = get_eessi_envvar('EPREFIX')
cmd_prefix_riscv_pc = cmd_prefix.replace('-unknown-', '-pc-')
if (
not os.path.exists(os.path.join(eprefix, 'usr', 'bin', cmd_prefix + 'ld')) and
os.path.exists(os.path.join(eprefix, 'usr', 'bin', cmd_prefix_riscv_pc + 'ld'))
):
self.log.info(f"Using {cmd_prefix_riscv_pc} instead of {cmd_prefix} as command prefix.")
cmd_prefix = cmd_prefix_riscv_pc
for cmd in ('ld', 'ld.gold', 'ld.bfd'):
wrapper = which(cmd)
if wrapper is None:
if cmd in ['ld.gold']:
# newer compatibility layers don't have ld.gold
continue
else:
raise EasyBuildError(f"No RPATH wrapper script found for {cmd}.")
self.log.info("Path to %s wrapper: %s" % (cmd, wrapper))
wrapper_dir = os.path.dirname(wrapper)
prefix_wrapper = os.path.join(wrapper_dir, cmd_prefix + cmd)
Expand Down
Loading