Skip to content

Commit

Permalink
intl dep: forward static to iconv if needed
Browse files Browse the repository at this point in the history
In 1fb6c93 the intl dep gained support for static linking
which also forwarded this property to the iconv sub dependency.

The refactoring in 214d035 lost this change, which results in
iconv getting linked dynamically again.

Forward static again to fix this.
  • Loading branch information
lazka authored and eli-schwartz committed Dec 12, 2021
1 parent 0766182 commit a2934ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mesonbuild/dependencies/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
self.is_found = True

if self.static:
if not self._add_sub_dependency(iconv_factory(env, self.for_machine, {})):
if not self._add_sub_dependency(iconv_factory(env, self.for_machine, {'static': True})):
self.is_found = False
return

Expand Down

0 comments on commit a2934ca

Please sign in to comment.