diff --git a/mesonbuild/dependencies/detect.py b/mesonbuild/dependencies/detect.py index faf024de9c31..58791cdd5790 100644 --- a/mesonbuild/dependencies/detect.py +++ b/mesonbuild/dependencies/detect.py @@ -41,7 +41,7 @@ def __contains__(self, key: object) -> bool: def get_dep_identifier(name: str, kwargs: T.Dict[str, T.Any]) -> 'TV_DepID': identifier: 'TV_DepID' = (('name', name), ) from ..interpreter import permitted_dependency_kwargs - assert len(permitted_dependency_kwargs) == 19, \ + assert len(permitted_dependency_kwargs) == 20, \ 'Extra kwargs have been added to dependency(), please review if it makes sense to handle it here' for key, value in kwargs.items(): # 'version' is irrelevant for caching; the caller must check version matches @@ -54,7 +54,7 @@ def get_dep_identifier(name: str, kwargs: T.Dict[str, T.Any]) -> 'TV_DepID': # 'not_found_message' has no impact on the dependency lookup # 'include_type' is handled after the dependency lookup if key in {'version', 'native', 'required', 'fallback', 'allow_fallback', 'default_options', - 'not_found_message', 'include_type'}: + 'not_found_message', 'include_type', 'llvm'}: continue # All keyword arguments are strings, ints, or lists (or lists of lists) if isinstance(value, list): diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index 46047cbe828b..2affd00d2f18 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -641,7 +641,7 @@ def __init__(self, name: str, env: Environment, kwargs: T.Dict[str, T.Any], lang self.is_found = True return - mlog.debug(f'Could not find Clang in {search}, because of version mismatch, ' + mlog.debug(f'Could not use Clang in {search}, because of version mismatch, ' f'required {", ".join(self.version_reqs)}, version: {version}') def log_details(self) -> str: diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 95d85ac07ebf..a7052f0fc3b9 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -242,6 +242,7 @@ class InterpreterRuleRelaxation(Enum): 'fallback', 'include_type', 'language', + 'llvm', 'main', 'method', 'modules',