diff options
| author | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2017-09-18 22:19:12 +0200 |
|---|---|---|
| committer | Alexis Jeandet <alexis.jeandet@member.fsf.org> | 2017-09-18 22:25:34 +0200 |
| commit | e553d0807bad5db8290e26954ce7634bc0e181fd (patch) | |
| tree | 3fb5c9c681bf7071c0765c0f2d55d067a27d70ce /mesonbuild/modules | |
| parent | bf64cf569b6ecf90db0f2bb181edb8f0ff0c9a3b (diff) | |
| download | meson-e553d0807bad5db8290e26954ce7634bc0e181fd.zip meson-e553d0807bad5db8290e26954ce7634bc0e181fd.tar.gz meson-e553d0807bad5db8290e26954ce7634bc0e181fd.tar.bz2 | |
Last round with listify function refactoring.
Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 4 | ||||
| -rw-r--r-- | mesonbuild/modules/unstable_simd.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 972c8f0..137d380 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -1201,9 +1201,7 @@ G_END_DECLS''' arg_list = kwargs.get('packages') if not arg_list: return [], [], [], [] - if not isinstance(arg_list, list): - arg_list = [arg_list] - + arg_list = mesonlib.listify(arg_list) vapi_depends = [] vapi_packages = [] vapi_includes = [] diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py index 828afec..b774cff 100644 --- a/mesonbuild/modules/unstable_simd.py +++ b/mesonbuild/modules/unstable_simd.py @@ -73,9 +73,7 @@ class SimdModule(ExtensionModule): } lib_kwargs.update(basic_kwargs) langarg_key = compiler.get_language() + '_args' - old_lang_args = lib_kwargs.get(langarg_key, []) - if not isinstance(old_lang_args, list): - old_lang_args = [old_lang_args] + old_lang_args = mesonlib.extract_as_list(lib_kwargs, langarg_key) all_lang_args = old_lang_args + args lib_kwargs[langarg_key] = all_lang_args result.append(interpreter.func_static_lib(None, [libname], lib_kwargs)) |