@@ -429,7 +429,7 @@ def configure_step(self):
429429 "without specifying 'amd_gfx_list'" )
430430 gpu_archs += self .amd_gfx
431431 self .log .info ("Using AMDGPU targets: %s" , ', ' .join (self .amd_gfx ))
432- general_opts ['LIBOMPTARGET_DEVICE_ARCHITECTURES' ] = ';' .join (gpu_archs )
432+ general_opts ['LIBOMPTARGET_DEVICE_ARCHITECTURES' ] = '"%s"' % ' ;' .join (gpu_archs )
433433
434434 self ._configure_general_build ()
435435
@@ -808,13 +808,13 @@ def sanity_check_step(self, custom_paths=None, custom_commands=None, extension=F
808808 check_lib_files += ['libbolt_rt_instr.a' ]
809809 if 'openmp' in self .final_projects :
810810 check_lib_files += ['libomp.so' , 'libompd.so' ]
811- check_lib_files += ['libomptarget.%s' % shlib_ext , 'libomptarget.rtl.%s.%s ' % ( arch , shlib_ext ) ]
811+ check_lib_files += ['libomptarget.so' , 'libomptarget.rtl.%s.so ' % arch ]
812812 if 'NVPTX' in self .cfg ['build_targets' ]:
813813 check_lib_files += ['libomptarget.rtl.cuda.so' ]
814814 check_lib_files += ['libomptarget-nvptx-sm_%s.bc' % cc for cc in self .cuda_cc ]
815815 if 'AMDGPU' in self .cfg ['build_targets' ]:
816816 check_lib_files += ['libomptarget.rtl.amdgpu.so' ]
817- check_lib_files += ['llibomptarget-amdgcn -%s.bc' % gfx for gfx in self .amd_gfx ]
817+ check_lib_files += ['llibomptarget-amdgpu -%s.bc' % gfx for gfx in self .amd_gfx ]
818818 if self .cfg ['build_openmp_tools' ]:
819819 check_files += [os .path .join ('lib' , 'clang' , resdir_version , 'include' , 'ompt.h' )]
820820 if self .cfg ['python_bindings' ]:
0 commit comments