diff options
| author | iarspider <iarspider@gmail.com> | 2022-12-17 23:44:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-17 14:44:27 -0800 |
| commit | 237d26460d6bba329a667baf3468e1465e696cff (patch) | |
| tree | 113f0c368a154d4830e78425d64b1548695c3a35 /var | |
| parent | 1020b65297bcf434d5fb515afb7e39acc9bba5d4 (diff) | |
| download | spack-237d26460d6bba329a667baf3468e1465e696cff.tar.gz spack-237d26460d6bba329a667baf3468e1465e696cff.tar.bz2 spack-237d26460d6bba329a667baf3468e1465e696cff.tar.xz spack-237d26460d6bba329a667baf3468e1465e696cff.zip | |
LLVM: replace libelf dependency with elf (#34265)
* LLVM: replace libelf dependency with elf
I didn't test this extensively, but in CMS LLVM builds just fine with elfutils.
* [@spackbot] updating style on behalf of iarspider
Co-authored-by: iarspider <iarspider@users.noreply.github.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 0f0ac12f72..a5bd39138c 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -236,7 +236,7 @@ class Llvm(CMakePackage, CudaPackage): # openmp dependencies depends_on("perl-data-dumper", type=("build")) depends_on("hwloc") - depends_on("libelf", when="+cuda") # libomptarget + depends_on("elf", when="+cuda") # libomptarget depends_on("libffi", when="+cuda") # libomptarget # llvm-config --system-libs libraries. @@ -598,9 +598,7 @@ class Llvm(CMakePackage, CudaPackage): [ define("LIBOMPTARGET_NVPTX_ENABLE_BCLIB", True), # work around bad libelf detection in libomptarget - define( - "LIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR", spec["libelf"].prefix.include - ), + define("LIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR", spec["elf"].prefix.include), ] ) else: @@ -737,9 +735,7 @@ class Llvm(CMakePackage, CudaPackage): cmake_args.extend( [ define("LIBOMPTARGET_NVPTX_ENABLE_BCLIB", True), - define( - "LIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR", spec["libelf"].prefix.include - ), + define("LIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR", spec["elf"].prefix.include), self.stage.source_path + "/openmp", ] ) |