diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-12-29 18:23:36 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-12-30 20:01:56 +0200 |
| commit | e4ba1fe89fa849397785863e504f5071bf375a7c (patch) | |
| tree | 94e84a20cc05421ded36dae318e43899fe9b57c7 /mesonbuild/compilers | |
| parent | 4df9006ca43338fea07b9d542f94da34369e43d3 (diff) | |
| download | meson-fix4671.tar.gz | |
Handle strings in cross file args. Closes #4671.fix4671
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index 2a5c9763a..31047b14e 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1048,10 +1048,10 @@ class Compiler: if 'properties' in environment.cross_info.config: props = environment.cross_info.config['properties'] lang_args_key = self.language + '_args' - extra_flags += props.get(lang_args_key, []) + extra_flags += mesonlib.stringlistify(props.get(lang_args_key, [])) lang_link_args_key = self.language + '_link_args' if link: - extra_flags += props.get(lang_link_args_key, []) + extra_flags += mesonlib.stringlistify(props.get(lang_link_args_key, [])) return extra_flags def _get_compile_output(self, dirname, mode): |