update clang_aomp for ROCm 5.6

akesandgren · Jul 7, 2023 · a70c426 · a70c426
1 parent fddeab7
commit a70c426
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/easybuild/easyblocks/c/clang_aomp.py b/easybuild/easyblocks/c/clang_aomp.py
@@ -177,7 +177,9 @@ def sanity_check_step(self):
         for gfx in self.amd_gfx_archs:
             if LooseVersion(self.version) < LooseVersion("5.2"):
                 custom_paths['files'].extend([os.path.join(libdevice, 'lib%s-amdgcn-%s.bc' % (x, gfx)) for x in libs])
-            if LooseVersion(self.version) >= LooseVersion("5"):
+            if LooseVersion(self.version) >= LooseVersion("5.6"):
+                custom_paths['files'].append(os.path.join('lib', 'libomptarget-old-amdgpu-%s.bc' % gfx))
+            elif LooseVersion(self.version) >= LooseVersion("5"):
                 custom_paths['files'].append(os.path.join('lib', 'libomptarget-amdgcn-%s.bc' % gfx))
                 custom_paths['files'].append(os.path.join('lib', 'libomptarget-new-amdgpu-%s.bc' % gfx))
 
@@ -230,7 +232,7 @@ def _configure_llvm(self, component):
         component['configopts'] = ' '.join([
             "-DLLVM_ENABLE_PROJECTS='clang;lld;compiler-rt'",
             "-DCLANG_DEFAULT_LINKER=lld",
-            "-DGCC_INSTALL_PREFIX=$EBROOTGCC",
+            "-DGCC_INSTALL_PREFIX=$EBROOTGCCCORE",
             "-DLLVM_ENABLE_ASSERTIONS=ON",
             "-DLLVM_ENABLE_BINDINGS=OFF",
             "-DLLVM_INCLUDE_BENCHMARKS=OFF",