diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-13 12:22:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-13 12:22:11 +0200 |
| commit | de83e94b5a9ce0f540814cee40ef3746b6ebb824 (patch) | |
| tree | be5504f488f980b6e394b4a2801864485c4dd792 /mesonbuild/interpreterbase.py | |
| parent | 07679f0330ccc4ee3839e702d79ecdd349437593 (diff) | |
| parent | 2c83bd16fc03afd2d8605734dce1ffc1946bf3d2 (diff) | |
| download | meson-de83e94b5a9ce0f540814cee40ef3746b6ebb824.zip meson-de83e94b5a9ce0f540814cee40ef3746b6ebb824.tar.gz meson-de83e94b5a9ce0f540814cee40ef3746b6ebb824.tar.bz2 | |
Merge pull request #1171 from centricular/fix-extracted-generated-prebuilt-object-targets-linking
Several fixes to how we handle objects in build targets
Diffstat (limited to 'mesonbuild/interpreterbase.py')
| -rw-r--r-- | mesonbuild/interpreterbase.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py index 97814f4..af1e8fb 100644 --- a/mesonbuild/interpreterbase.py +++ b/mesonbuild/interpreterbase.py @@ -526,7 +526,7 @@ class InterpreterBase: def flatten(self, args): if isinstance(args, mparser.StringNode): return args.value - if isinstance(args, (int, str, InterpreterObject)): + if isinstance(args, (int, str, mesonlib.File, InterpreterObject)): return args result = [] for a in args: |