Skip to content

enhance GCC easyblock to also put symlinks for cc/c++/f77/f95 in place #1256

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
wpoely86 merged 4 commits into from
Sep 20, 2017
Merged

enhance GCC easyblock to also put symlinks for cc/c++/f77/f95 in place #1256

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2771ec9
add symlinks for cc/c++/f77/f95 in post_install step of GCC easyblock…
boegel Sep 19, 2017
e0bb6fb
don't use absolute path when symlinking cc (& co) to gcc (& co)
boegel Sep 19, 2017
a995b76
avoid cd'ing into /bin to create cc & co symlinks for GCC
boegel Sep 20, 2017
33beb7b
use global constant for symlink commands in GCC easyblock
boegel Sep 20, 2017
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
35 changes: 32 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 @@ -45,10 +45,19 @@
from easybuild.easyblocks.generic.configuremake import ConfigureMake
from easybuild.framework.easyconfig import CUSTOM
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.filetools import write_file
from easybuild.tools.filetools import symlink, write_file
from easybuild.tools.modules import get_software_root
from easybuild.tools.run import run_cmd
from easybuild.tools.systemtools import check_os_dependency, get_os_name, get_os_type, get_shared_lib_ext, get_platform_name
from easybuild.tools.systemtools import check_os_dependency, get_os_name, get_os_type, get_platform_name
from easybuild.tools.systemtools import get_shared_lib_ext


COMP_CMD_SYMLINKS = {
'cc': 'gcc',
'c++': 'g++',
'f77': 'gfortran',
'f95': 'gfortran',
}


class EB_GCC(ConfigureMake):
Expand Down Expand Up @@ -507,6 +516,24 @@ def build_step(self):

# make install is just standard install_step, nothing special there

def post_install_step(self, *args, **kwargs):
"""
Post-processing after installation: add symlinks for cc, c++, f77, f95
"""
super(EB_GCC, self).post_install_step(*args, **kwargs)

bindir = os.path.join(self.installdir, 'bin')
for key in COMP_CMD_SYMLINKS:
src = COMP_CMD_SYMLINKS[key]
target = os.path.join(bindir, key)
if os.path.exists(target):
self.log.info("'%s' already exists in %s, not replacing it with symlink to '%s'",
key, bindir, src)
elif os.path.exists(os.path.join(bindir, src)):
symlink(src, target, use_abspath_source=False)
else:
raise EasyBuildError("Can't link '%s' to non-existing location %s", target, os.path.join(bindir, src))

def sanity_check_step(self):
"""
Custom sanity check for GCC
Expand Down Expand Up @@ -570,8 +597,10 @@ def sanity_check_step(self):
libdirs = ['libexec', 'lib']
libexec_files = [tuple([os.path.join(libdir, common_infix, x) for libdir in libdirs]) for x in libexec_files]

old_cmds = [os.path.join('bin', x) for x in COMP_CMD_SYMLINKS.keys()]

custom_paths = {
'files': bin_files + lib_files + libexec_files,
'files': bin_files + lib_files + libexec_files + old_cmds,
'dirs': dirs,
}

Expand Down