From 237d26460d6bba329a667baf3468e1465e696cff Mon Sep 17 00:00:00 2001 From: iarspider Date: Sat, 17 Dec 2022 23:44:27 +0100 Subject: 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 --- var/spack/repos/builtin/packages/llvm/package.py | 10 +++------- 1 file 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", ] ) -- cgit v1.2.3-60-g2f50