From bfaed7f5b953a57f0d48d1c1e56d5c01b76c6291 Mon Sep 17 00:00:00 2001 From: Ake Sandgren Date: Fri, 19 Jan 2024 09:16:25 +0100 Subject: [PATCH] clang_aomp: Make list of PROJECTS/RUNTIMES to easy transition between them later --- easybuild/easyblocks/c/clang_aomp.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/easybuild/easyblocks/c/clang_aomp.py b/easybuild/easyblocks/c/clang_aomp.py index 8959d34235..b26dea455e 100644 --- a/easybuild/easyblocks/c/clang_aomp.py +++ b/easybuild/easyblocks/c/clang_aomp.py @@ -228,10 +228,12 @@ def _configure_llvm(self, component): # dependency and interrupts building of LLVM component['prebuildopts'] = "unset CPATH && " + projects = ['clang', 'lld', 'clang-tools-extra', 'compiler-rt'] + runtimes = ['libcxx', 'libcxxabi'] # Setup configuration options for LLVM component['configopts'] = ' '.join([ - "-DLLVM_ENABLE_PROJECTS='clang;lld;clang-tools-extra'", - "-DLLVM_ENABLE_RUNTIMES='compiler-rt;libcxx;libcxxabi'", + "-DLLVM_ENABLE_PROJECTS='%s'" % ';'.join(projects), + "-DLLVM_ENABLE_RUNTIMES='%s'" % ';'.join(runtimes), "-DCLANG_DEFAULT_LINKER=lld", "-DGCC_INSTALL_PREFIX=%s" % os.getenv('EBROOTGCC', os.getenv('EBROOTGCCCORE')), "-DLLVM_ENABLE_ASSERTIONS=ON",