From 2163c3701caa449bba51bf42dd7be2873f778e29 Mon Sep 17 00:00:00 2001 From: renjithravindrankannath <94420380+renjithravindrankannath@users.noreply.github.com> Date: Tue, 11 Jul 2023 03:25:39 +0530 Subject: Setting library path as lib similar to other rocm packages. (#37568) * Setting library path as lib similar to other rocm packages. * Fix style check failure * Restricting changes to 5.4.3 and above * Including comgr change --- var/spack/repos/builtin/packages/comgr/package.py | 2 ++ var/spack/repos/builtin/packages/hsakmt-roct/package.py | 5 ++++- var/spack/repos/builtin/packages/llvm-amdgpu/package.py | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index 597655e3ab..60169c4aca 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -161,6 +161,8 @@ class Comgr(CMakePackage): def cmake_args(self): args = [self.define("BUILD_TESTING", self.run_tests)] + if self.spec.satisfies("@5.4.3:"): + args.append("-DCMAKE_INSTALL_LIBDIR=lib") return args @classmethod diff --git a/var/spack/repos/builtin/packages/hsakmt-roct/package.py b/var/spack/repos/builtin/packages/hsakmt-roct/package.py index 4d594406c7..dc45723a99 100644 --- a/var/spack/repos/builtin/packages/hsakmt-roct/package.py +++ b/var/spack/repos/builtin/packages/hsakmt-roct/package.py @@ -130,7 +130,10 @@ class HsakmtRoct(CMakePackage): return ["install"] def cmake_args(self): - return [self.define_from_variant("BUILD_SHARED_LIBS", "shared")] + args = [self.define_from_variant("BUILD_SHARED_LIBS", "shared")] + if self.spec.satisfies("@5.4.3:"): + args.append("-DCMAKE_INSTALL_LIBDIR=lib") + return args @run_after("install") @on_package_attributes(run_tests=True) diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 472b7f98b4..25d24cfc45 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -272,7 +272,8 @@ class LlvmAmdgpu(CMakePackage): # Get the GCC prefix for LLVM. if self.compiler.name == "gcc": args.append(self.define("GCC_INSTALL_PREFIX", self.compiler.prefix)) - + if self.spec.satisfies("@5.4.3:"): + args.append("-DCMAKE_INSTALL_LIBDIR=lib") return args @run_after("install") -- cgit v1.2.3-60-g2f50