From 5ca9fd6c82159cbbe16a9186d23ed4cfddb8bbd9 Mon Sep 17 00:00:00 2001 From: "Wileam Y. Phan" <50928756+wyphan@users.noreply.github.com> Date: Thu, 21 Sep 2023 14:15:20 -0400 Subject: Fix false detection of llvm-amdgpu as llvm and llvm-doe (#40113) --- var/spack/repos/builtin/packages/llvm-doe/package.py | 2 ++ var/spack/repos/builtin/packages/llvm/package.py | 2 ++ 2 files changed, 4 insertions(+) (limited to 'var') 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) -- cgit v1.2.3-70-g09d2