Skip to content

Commit

Permalink
fixup! dependencies/clang: Add a dependency for Clang
Browse files Browse the repository at this point in the history
  • Loading branch information
dcbaker committed Jul 18, 2024
1 parent 87afe53 commit 272c8a2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions mesonbuild/dependencies/detect.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion mesonbuild/dependencies/dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions mesonbuild/interpreter/interpreter.py
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ class InterpreterRuleRelaxation(Enum):
'fallback',
'include_type',
'language',
'llvm',
'main',
'method',
'modules',
Expand Down

0 comments on commit 272c8a2

Please sign in to comment.