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

Fix false detection of llvm-amdgpu as llvm and llvm-doe (#40113)

Browse Source
This commit is contained in:
Wileam Y. Phan 2023-09-21 14:15:20 -04:00 committed by GitHub
parent ef165c80b3
commit 5ca9fd6c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/llvm-doe/package.py
View File

@ -252,6 +252,8 @@ def determine_version(cls, exe):
output = compiler("--version", output=str, error=str) output = compiler("--version", output=str, error=str)
if "Apple" in output: if "Apple" in output:
return None return None
if "AMD" in output:
return None
match = version_regex.search(output) match = version_regex.search(output)
if match: if match:
return match.group(match.lastindex) return match.group(match.lastindex)

2
var/spack/repos/builtin/packages/llvm/package.py
View File

@ -597,6 +597,8 @@ def determine_version(cls, exe):
output = compiler("--version", output=str, error=str) output = compiler("--version", output=str, error=str)
if "Apple" in output: if "Apple" in output:
return None return None
if "AMD" in output:
return None
match = version_regex.search(output) match = version_regex.search(output)
if match: if match:
return match.group(match.lastindex) return match.group(match.lastindex)