Skip to content

pass paths to patch one by one to apply_regex_substitutions in GCC easyblock when --sysroot is set #2217

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
akesandgren merged 1 commit into from
Oct 30, 2020
Merged

pass paths to patch one by one to apply_regex_substitutions in GCC easyblock when --sysroot is set #2217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion easybuild/easyblocks/g/gcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,8 @@ def configure_step(self):
# #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
gcc_config_headers = glob.glob(os.path.join('gcc', 'config', '*', '*linux*.h'))
regex_subs = [('(_DYNAMIC_LINKER.*[":])/lib', r'\1%s/lib' % sysroot)]
apply_regex_substitutions(gcc_config_headers, regex_subs)
for gcc_config_header in gcc_config_headers:
apply_regex_substitutions(gcc_config_header, regex_subs)

# self.configopts will be reused in a 3-staged build,
# configopts is only used in first configure
Expand Down