diff options
| author | Kyle Knoepfel <knoepfel@fnal.gov> | 2024-09-04 05:12:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-04 04:12:42 -0600 |
| commit | 7ba0132f66037e2950ccc58bdefd45a3219aa9b9 (patch) | |
| tree | 575d6d0dcda5a84bcf4ec92201b2baaf48c5c9ae | |
| parent | 744f034dfb15d974a887ba19cd83ce2bdfb34cf5 (diff) | |
| download | spack-7ba0132f66037e2950ccc58bdefd45a3219aa9b9.tar.gz spack-7ba0132f66037e2950ccc58bdefd45a3219aa9b9.tar.bz2 spack-7ba0132f66037e2950ccc58bdefd45a3219aa9b9.tar.xz spack-7ba0132f66037e2950ccc58bdefd45a3219aa9b9.zip | |
llvm: improve detection regexes (#46187)
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 4 |
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 9a0581f8d4..b10006052d 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|dab|server)" + r"include-fixer|import-test|dap|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 + [r"^ld.lld(-[\d][\d]*)?$", r"^lldb(-[\d][\d]*)?$"] + return super().executables + [r"^ld\.lld(-\d+)?$", r"^lldb(-\d+)?$"] @classmethod def determine_version(cls, exe): |