zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hipsycl: fix building on OSX. Patch boost to be backward-compatible. (#31311)

Browse Source 
Co-authored-by: frobnitzem <frobnitzem@users.noreply.github.com>
This commit is contained in:
David M. Rogers 2022-08-30 04:22:34 -04:00 committed by GitHub
parent 3779e645b8
commit d75234b675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
var/spack/repos/builtin/packages/hipsycl/package.py
View File

@ -132,7 +132,9 @@ def filter_config_file(self):
# the libc++.so and libc++abi.so dyn linked to the sycl # the libc++.so and libc++abi.so dyn linked to the sycl
# ptx backend # ptx backend
rpaths = set() rpaths = set()
so_paths = filesystem.find(self.spec["llvm"].prefix, "libc++.so") so_paths = filesystem.find_libraries(
"libc++", self.spec["llvm"].prefix, shared=True, recursive=True
)
if len(so_paths) != 1: if len(so_paths) != 1:
raise InstallError( raise InstallError(
"concretized llvm dependency must provide a " "concretized llvm dependency must provide a "
@ -140,11 +142,13 @@ def filter_config_file(self):
"found: {0}".format(so_paths) "found: {0}".format(so_paths)
) )
rpaths.add(path.dirname(so_paths[0])) rpaths.add(path.dirname(so_paths[0]))
so_paths = filesystem.find(self.spec["llvm"].prefix, "libc++abi.so") so_paths = filesystem.find_libraries(
"libc++abi", self.spec["llvm"].prefix, shared=True, recursive=True
)
if len(so_paths) != 1: if len(so_paths) != 1:
raise InstallError( raise InstallError(
"concretized llvm dependency must provide a " "concretized llvm dependency must provide a "
"unique directory containing libc++abi.so, " "unique directory containing libc++abi, "
"found: {0}".format(so_paths) "found: {0}".format(so_paths)
) )
rpaths.add(path.dirname(so_paths[0])) rpaths.add(path.dirname(so_paths[0]))