aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.pylintrc1
-rw-r--r--mesonbuild/dependencies/dev.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/.pylintrc b/.pylintrc
index 59cdc5e..6245958 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -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: