zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build failure due to #20759 change (#21185)

Browse Source
This commit is contained in:
Sreenivasa Murthy Kolam 2021-01-21 22:43:28 +05:30 committed by GitHub
parent 6e258ca6ca
commit 85ea52acd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
var/spack/repos/builtin/packages/llvm-amdgpu/package.py
View File

@ -33,6 +33,9 @@ class LlvmAmdgpu(CMakePackage):
depends_on('z3', type='link') depends_on('z3', type='link')
depends_on('zlib', type='link') depends_on('zlib', type='link')
depends_on('ncurses+termlib', 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') depends_on('libelf', type='link', when='+openmp')
# Will likely only be fixed in LLVM 12 upstream # Will likely only be fixed in LLVM 12 upstream
@ -62,7 +65,16 @@ def cmake_args(self):
] ]
if self.compiler.name == "gcc": 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) args.append("-DGCC_INSTALL_PREFIX=" + gcc_prefix)
return args return args