llvm: be more strict with detection (#46179)

This commit is contained in:
Massimiliano Culpo 2024-09-03 22:37:30 +02:00 committed by GitHub
parent 9b077a360e
commit d41fb3d542
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -30,7 +30,7 @@ def filter_detected_exes(cls, prefix, exes_in_prefix):
reject = re.compile( reject = re.compile(
r"-(vscode|cpp|cl|gpu|tidy|rename|scan-deps|format|refactor|offload|" r"-(vscode|cpp|cl|gpu|tidy|rename|scan-deps|format|refactor|offload|"
r"check|query|doc|move|extdef|apply|reorder|change-namespace|" 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)] return [x for x in exes_in_prefix if not reject.search(x)]
@ -652,7 +652,7 @@ def supported_languages(self):
@classproperty @classproperty
def executables(cls): def executables(cls):
return super().executables + ["ld.lld", "lldb"] return super().executables + [r"^ld.lld(-[\d][\d]*)?$", r"^lldb(-[\d][\d]*)?$"]
@classmethod @classmethod
def determine_version(cls, exe): def determine_version(cls, exe):