diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-09-08 10:30:39 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-11-29 22:00:12 -0500 |
| commit | e8727fc8571bc8b9dc23255c267b52478d12e66f (patch) | |
| tree | f3afb2e3b581ad3db3257f72ea36adb064f42cab | |
| parent | 6190b6466e000d435793b544eaa6df25216a7cf4 (diff) | |
| download | meson-e8727fc8571bc8b9dc23255c267b52478d12e66f.zip meson-e8727fc8571bc8b9dc23255c267b52478d12e66f.tar.gz meson-e8727fc8571bc8b9dc23255c267b52478d12e66f.tar.bz2 | |
pylint: enable implicit-str-concat
Which catches a very real bug. The zlib system dependency failed to work
on MSVC since initial implementation in commit
c1a3b37ab7e4ccf3a946ee4ba6da81a4c230ecc4 -- it looked for the wrong
name.
| -rw-r--r-- | .pylintrc | 1 | ||||
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -20,7 +20,6 @@ disable= duplicate-value, exec-used, fixme, - implicit-str-concat, import-error, import-outside-toplevel, inconsistent-mro, diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index b345387..0c4690b 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -500,7 +500,7 @@ class ZlibSystemDependency(SystemDependency): self.link_args = ['-lz'] else: if self.clib_compiler.get_argument_syntax() == 'msvc': - libs = ['zlib1' 'zlib'] + libs = ['zlib1', 'zlib'] else: libs = ['z'] for lib in libs: |