Skip to content

Update Clang easyblock for fixed 'finalpath' source attributes #3961

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
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update Clang easyblock for fixed 'finalpath' source attributes #3961

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
51 changes: 20 additions & 31 deletions easybuild/easyblocks/c/clang.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,11 +258,11 @@ def find_source_dir(globpatterns, targetdir):

glob_src_dirs = [glob_dir for globpattern in globpatterns for glob_dir in glob.glob(globpattern)]
if len(glob_src_dirs) != 1:
raise EasyBuildError("Failed to find exactly one source directory for pattern %s: %s", globpatterns,
glob_src_dirs)
raise EasyBuildError("Failed to find exactly one source directory in %s for pattern %s: %s",
os.getcwd(), globpatterns, glob_src_dirs)
src_dirs[glob_src_dirs[0]] = targetdir

if any([x['name'].startswith('llvm-project') for x in self.src]):
if any(x['name'].startswith('llvm-project') for x in self.src):
# if sources contain 'llvm-project*', we use the full tarball
find_source_dir("../llvm-project-*", os.path.join(self.llvm_src_dir, "llvm-project-%s" % self.version))
self.cfg.update('configopts', '-DLLVM_ENABLE_PROJECTS="%s"' % ';'.join(self.cfg['llvm_projects']))
Expand All @@ -283,36 +283,25 @@ def find_source_dir(globpatterns, targetdir):
# lld/ Unpack lld-*.tar.gz here
# lldb/ Unpack lldb-*.tar.gz here
# libunwind/ Unpack libunwind-*.tar.gz here
find_source_dir('compiler-rt-*', os.path.join(self.llvm_src_dir, 'projects', 'compiler-rt'))

if 'polly' in self.cfg['llvm_projects']:
find_source_dir('polly-*', os.path.join(self.llvm_src_dir, 'tools', 'polly'))

if 'lld' in self.cfg['llvm_projects']:
find_source_dir('lld-*', os.path.join(self.llvm_src_dir, 'tools', 'lld'))
if LooseVersion(self.version) >= LooseVersion('12.0.1'):
find_source_dir('libunwind-*', os.path.normpath(os.path.join(self.llvm_src_dir, '..', 'libunwind')))

if 'lldb' in self.cfg['llvm_projects']:
find_source_dir('lldb-*', os.path.join(self.llvm_src_dir, 'tools', 'lldb'))

if 'libcxx' in self.cfg['llvm_runtimes']:
find_source_dir('libcxx-*', os.path.join(self.llvm_src_dir, 'projects', 'libcxx'))
find_source_dir('libcxxabi-*', os.path.join(self.llvm_src_dir, 'projects', 'libcxxabi'))

find_source_dir(['clang-[1-9]*', 'cfe-*'], os.path.join(self.llvm_src_dir, 'tools', 'clang'))

if 'clang-tools-extra' in self.cfg['llvm_projects']:
find_source_dir('clang-tools-extra-*',
os.path.join(self.llvm_src_dir, 'tools', 'clang', 'tools', 'extra'))

if LooseVersion(self.version) >= LooseVersion('3.8'):
find_source_dir('openmp-*', os.path.join(self.llvm_src_dir, 'projects', 'openmp'))
src_dirs = {
'compiler-rt-': os.path.join(self.llvm_src_dir, 'projects', 'compiler-rt'),
'polly-': os.path.join(self.llvm_src_dir, 'tools', 'polly'),
'lld-': os.path.join(self.llvm_src_dir, 'tools', 'lld'),
'libunwind-': os.path.normpath(os.path.join(self.llvm_src_dir, '..', 'libunwind')),
'lldb-': os.path.join(self.llvm_src_dir, 'tools', 'lldb'),
'libcxx-': os.path.join(self.llvm_src_dir, 'projects', 'libcxx'),
'libcxxabi-': os.path.join(self.llvm_src_dir, 'projects', 'libcxxabi'),
# MUST be before clang-
'clang-tools-extra-': os.path.join(self.llvm_src_dir, 'tools', 'clang', 'tools', 'extra'),
'clang-': os.path.join(self.llvm_src_dir, 'tools', 'clang'),
'cfe-': os.path.join(self.llvm_src_dir, 'tools', 'clang'),
'openmp-': os.path.join(self.llvm_src_dir, 'projects', 'openmp'),
}

for src in self.src:
for (dirname, new_path) in src_dirs.items():
if src['name'].startswith(dirname):
old_path = os.path.join(src['finalpath'], dirname)
for (prefix, new_path) in src_dirs.items():
if src['name'].startswith(prefix):
old_path = src['finalpath']
try:
shutil.move(old_path, new_path)
except IOError as err:
Expand Down