summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2024-09-03 22:37:30 +0200
committerGitHub <noreply@github.com>2024-09-03 22:37:30 +0200
commitd41fb3d542fd273a95f61e120ce0d506d59905fa (patch)
treeae93a850851e923fcaa73f191c02edf4e9eefbcd
parent9b077a360e73ddeadf473f99530c082d9cb83685 (diff)
downloadspack-d41fb3d542fd273a95f61e120ce0d506d59905fa.tar.gz
spack-d41fb3d542fd273a95f61e120ce0d506d59905fa.tar.bz2
spack-d41fb3d542fd273a95f61e120ce0d506d59905fa.tar.xz
spack-d41fb3d542fd273a95f61e120ce0d506d59905fa.zip
llvm: be more strict with detection (#46179)
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index 72a4d30d29..9a0581f8d4 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -30,7 +30,7 @@ class LlvmDetection(PackageBase):
reject = re.compile(
r"-(vscode|cpp|cl|gpu|tidy|rename|scan-deps|format|refactor|offload|"
r"check|query|doc|move|extdef|apply|reorder|change-namespace|"
- r"include-fixer|import-test)"
+ r"include-fixer|import-test|dab|server)"
)
return [x for x in exes_in_prefix if not reject.search(x)]
@@ -652,7 +652,7 @@ class Llvm(CMakePackage, CudaPackage, LlvmDetection, CompilerPackage):
@classproperty
def executables(cls):
- return super().executables + ["ld.lld", "lldb"]
+ return super().executables + [r"^ld.lld(-[\d][\d]*)?$", r"^lldb(-[\d][\d]*)?$"]
@classmethod
def determine_version(cls, exe):