From d41fb3d542fd273a95f61e120ce0d506d59905fa Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Tue, 3 Sep 2024 22:37:30 +0200 Subject: [PATCH] llvm: be more strict with detection (#46179) --- var/spack/repos/builtin/packages/llvm/package.py | 4 ++-- 1 file 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 72a4d30d29a..9a0581f8d4e 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -30,7 +30,7 @@ def filter_detected_exes(cls, prefix, exes_in_prefix): 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 @@ def supported_languages(self): @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):