diff options
author | David M. Rogers <predictivestatmech@gmail.com> | 2022-08-30 04:22:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-30 10:22:34 +0200 |
commit | d75234b675c23ed14cf4ba80eeff9bdbdc7b8f01 (patch) | |
tree | 18f32c392dc94d8af686c60523bd35060722042a | |
parent | 3779e645b8261ad6d92233993d706b58287b0da1 (diff) | |
download | spack-d75234b675c23ed14cf4ba80eeff9bdbdc7b8f01.tar.gz spack-d75234b675c23ed14cf4ba80eeff9bdbdc7b8f01.tar.bz2 spack-d75234b675c23ed14cf4ba80eeff9bdbdc7b8f01.tar.xz spack-d75234b675c23ed14cf4ba80eeff9bdbdc7b8f01.zip |
hipsycl: fix building on OSX. Patch boost to be backward-compatible. (#31311)
Co-authored-by: frobnitzem <frobnitzem@users.noreply.github.com>
-rw-r--r-- | var/spack/repos/builtin/packages/hipsycl/package.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/hipsycl/package.py b/var/spack/repos/builtin/packages/hipsycl/package.py index 887d9f049b..1cc18e1c2d 100644 --- a/var/spack/repos/builtin/packages/hipsycl/package.py +++ b/var/spack/repos/builtin/packages/hipsycl/package.py @@ -132,7 +132,9 @@ class Hipsycl(CMakePackage): # the libc++.so and libc++abi.so dyn linked to the sycl # ptx backend 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: raise InstallError( "concretized llvm dependency must provide a " @@ -140,11 +142,13 @@ class Hipsycl(CMakePackage): "found: {0}".format(so_paths) ) 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: raise InstallError( "concretized llvm dependency must provide a " - "unique directory containing libc++abi.so, " + "unique directory containing libc++abi, " "found: {0}".format(so_paths) ) rpaths.add(path.dirname(so_paths[0])) |