diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-12-29 18:23:36 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-01-02 22:28:22 +0200 |
| commit | 6c76ac80173bdc40d35e2d6b802f7950646781dc (patch) | |
| tree | bc635c41daa915ae68b9cffe31e47eaf02cc8fcb /mesonbuild/compilers/compilers.py | |
| parent | ee555e37c9940e04d12f5e11a396d857dc0b7b66 (diff) | |
| download | meson-6c76ac80173bdc40d35e2d6b802f7950646781dc.zip meson-6c76ac80173bdc40d35e2d6b802f7950646781dc.tar.gz meson-6c76ac80173bdc40d35e2d6b802f7950646781dc.tar.bz2 | |
Handle strings in cross file args. Closes #4671.
Diffstat (limited to 'mesonbuild/compilers/compilers.py')
| -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 2a5c976..31047b1 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): |