From 85ea52acd17090097f19d8f5d54142ee4f9002b5 Mon Sep 17 00:00:00 2001 From: Sreenivasa Murthy Kolam <67086238+srekolam@users.noreply.github.com> Date: Thu, 21 Jan 2021 22:43:28 +0530 Subject: [PATCH] fix build failure due to #20759 change (#21185) --- .../repos/builtin/packages/llvm-amdgpu/package.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 80a9139cd29..e351dc6b2be 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -33,6 +33,9 @@ class LlvmAmdgpu(CMakePackage): depends_on('z3', type='link') depends_on('zlib', type='link') depends_on('ncurses+termlib', type='link') + # openmp dependencies + depends_on("perl-data-dumper", type=("build"), when='+openmp') + depends_on("hwloc", when='+openmp') depends_on('libelf', type='link', when='+openmp') # Will likely only be fixed in LLVM 12 upstream @@ -62,7 +65,16 @@ def cmake_args(self): ] if self.compiler.name == "gcc": - gcc_prefix = ancestor(self.compiler.cc, 2) + compiler = Executable(self.compiler.cc) + gcc_output = compiler('-print-search-dirs', output=str, error=str) + + for line in gcc_output.splitlines(): + if line.startswith("install:"): + # Get path and strip any whitespace + # (causes oddity with ancestor) + gcc_prefix = line.split(":")[1].strip() + gcc_prefix = ancestor(gcc_prefix, 4) + break args.append("-DGCC_INSTALL_PREFIX=" + gcc_prefix) return args