Skip to content
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

update GCC easyblock to ensure that --sysroot is passed to linker (but only when it needs to be) #2921

Merged
merged 3 commits into from
May 27, 2023
Merged

update GCC easyblock to ensure that --sysroot is passed to linker (but only when it needs to be) #2921

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55ec455
ensure that --sysroot is passed to linker
truib Apr 21, 2023
37ffbf6
Patch gcc.c* only for older sysroot-ed installations.
bartoldeman May 25, 2023
38282df
Merge pull request #1 from ComputeCanada/check-pass-sysroot-to-linker
trz42 May 27, 2023
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
17 changes: 14 additions & 3 deletions easybuild/easyblocks/g/gcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.config import build_option
from easybuild.tools.filetools import apply_regex_substitutions, change_dir, copy_file, move_file, symlink
from easybuild.tools.filetools import which, write_file
from easybuild.tools.filetools import which, read_file, write_file
from easybuild.tools.modules import get_software_root
from easybuild.tools.run import run_cmd
from easybuild.tools.systemtools import RISCV, check_os_dependency, get_cpu_architecture, get_cpu_family
Expand Down Expand Up @@ -357,8 +357,19 @@ def configure_step(self):
# (see https://gcc.gnu.org/install/configure.html)
self.cfg.update('configopts', '--with-sysroot=%s' % sysroot)

# avoid that --sysroot is passed to linker by patching value for SYSROOT_SPEC in gcc/gcc.c
apply_regex_substitutions(os.path.join('gcc', 'gcc.c'), [('--sysroot=%R', '')])
libc_so_candidates = [os.path.join(sysroot, x, 'libc.so') for x in
['lib', 'lib64', os.path.join('usr', 'lib'), os.path.join('usr', 'lib64')]]
for libc_so in libc_so_candidates:
if os.path.exists(libc_so):
# only patch gcc.c or gcc.cc if entries in libc.so are prefixed with sysroot
if '\nGROUP ( ' + sysroot in read_file(libc_so):
gccfile = os.path.join('gcc', 'gcc.c')
# renamed to gcc.cc in GCC 12
if not os.path.exists(gccfile):
gccfile = os.path.join('gcc', 'gcc.cc')
# avoid that --sysroot is passed to linker by patching value for SYSROOT_SPEC in gcc/gcc.c*
apply_regex_substitutions(gccfile, [('--sysroot=%R', '')])
break

# prefix dynamic linkers with sysroot
# this patches lines like:
Expand Down