diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2021-12-12 10:21:02 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2021-12-12 07:15:01 -0500 |
| commit | a2934ca9d13ede4eb97b320bc768319ecad7b525 (patch) | |
| tree | e43d655269daf16706795b5a292374b4731708d6 /mesonbuild/dependencies/misc.py | |
| parent | 076618260001783235b1a34eb52c6e067ac83be8 (diff) | |
| download | meson-a2934ca9d13ede4eb97b320bc768319ecad7b525.zip meson-a2934ca9d13ede4eb97b320bc768319ecad7b525.tar.gz meson-a2934ca9d13ede4eb97b320bc768319ecad7b525.tar.bz2 | |
intl dep: forward static to iconv if needed
In 1fb6c939473ca7cdab2 the intl dep gained support for static linking
which also forwarded this property to the iconv sub dependency.
The refactoring in 214d03568f75 lost this change, which results in
iconv getting linked dynamically again.
Forward static again to fix this.
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index e490e7d..470305e 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -487,7 +487,7 @@ class IntlSystemDependency(SystemDependency): 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 |