diff options
| author | Wileam Y. Phan <50928756+wyphan@users.noreply.github.com> | 2023-09-21 14:15:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-21 20:15:20 +0200 |
| commit | 5ca9fd6c82159cbbe16a9186d23ed4cfddb8bbd9 (patch) | |
| tree | c753aa7dbeb39df3b4375d9265232225398aabca | |
| parent | ef165c80b35b1b7b7cedeff9a479f3ec6792b55f (diff) | |
| download | spack-5ca9fd6c82159cbbe16a9186d23ed4cfddb8bbd9.tar.gz spack-5ca9fd6c82159cbbe16a9186d23ed4cfddb8bbd9.tar.bz2 spack-5ca9fd6c82159cbbe16a9186d23ed4cfddb8bbd9.tar.xz spack-5ca9fd6c82159cbbe16a9186d23ed4cfddb8bbd9.zip | |
Fix false detection of llvm-amdgpu as llvm and llvm-doe (#40113)
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm-doe/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/llvm-doe/package.py b/var/spack/repos/builtin/packages/llvm-doe/package.py index 7937124d75..d3a91114ad 100644 --- a/var/spack/repos/builtin/packages/llvm-doe/package.py +++ b/var/spack/repos/builtin/packages/llvm-doe/package.py @@ -252,6 +252,8 @@ class LlvmDoe(CMakePackage, CudaPackage): output = compiler("--version", output=str, error=str) if "Apple" in output: return None + if "AMD" in output: + return None match = version_regex.search(output) if match: return match.group(match.lastindex) diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index a4a89f17bc..df1aa7c86b 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -597,6 +597,8 @@ class Llvm(CMakePackage, CudaPackage): output = compiler("--version", output=str, error=str) if "Apple" in output: return None + if "AMD" in output: + return None match = version_regex.search(output) if match: return match.group(match.lastindex) |