diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-07-03 22:18:09 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-07-03 22:18:09 +0300 |
commit | cd40187d4ecc99a91aaaf2cad8991d600691c443 (patch) | |
tree | 1679bfa9595d98a18ca2784b00694d9308e1a2b3 /build.py | |
parent | 5cbcb144fa42cdf18e39212de7f82c537116d9a5 (diff) | |
download | meson-cd40187d4ecc99a91aaaf2cad8991d600691c443.zip meson-cd40187d4ecc99a91aaaf2cad8991d600691c443.tar.gz meson-cd40187d4ecc99a91aaaf2cad8991d600691c443.tar.bz2 |
Handle files() in Vala arguments and set up deps correctly.
Diffstat (limited to 'build.py')
-rw-r--r-- | build.py | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -17,7 +17,7 @@ import environment import dependencies import mlog import copy, os -from mesonlib import File +from mesonlib import File, flatten known_basic_kwargs = {'install' : True, 'c_pch' : True, @@ -476,8 +476,9 @@ class BuildTarget(): self.include_dirs += ids def add_compiler_args(self, language, args): + args = flatten(args) for a in args: - if not isinstance(a, str): + if not isinstance(a, (str, File)): raise InvalidArguments('A non-string passed to compiler args.') if language in self.extra_args: self.extra_args[language] += args |