Skip to content

build|interpreter: use typed_kwargs for BuildTarget(link_args) #15343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dcbaker wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −4
Open

build|interpreter: use typed_kwargs for BuildTarget(link_args) #15343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions mesonbuild/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,10 +1271,7 @@ def process_kwargs(self, kwargs: BuildTargetKeywordArguments) -> None:
self.pch['c'] = kwargs.get('c_pch')
self.pch['cpp'] = kwargs.get('cpp_pch')

self.link_args = extract_as_list(kwargs, 'link_args')
for i in self.link_args:
if not isinstance(i, str):
raise InvalidArguments('Link_args arguments must be strings.')
self.link_args = kwargs.get('link_args', [])
for l in self.link_args:
if '-Wl,-rpath' in l or l.startswith('-rpath'):
mlog.warning(textwrap.dedent('''\
Expand Down
6 changes: 6 additions & 0 deletions mesonbuild/interpreter/type_checking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,12 @@ def _pch_convertor(args: T.List[str]) -> T.Optional[T.Tuple[str, T.Optional[str]
since='0.48.0',
),
KwargInfo('install_rpath', str, default=''),
KwargInfo(
'link_args',
ContainerTypeInfo(list, str),
default=[],
listify=True,
),
KwargInfo(
'link_depends',
ContainerTypeInfo(list, (str, File, CustomTarget, CustomTargetIndex, BuildTarget)),
Expand Down
Loading