diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-09 13:36:13 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-13 09:37:48 +0530 |
| commit | 2c83bd16fc03afd2d8605734dce1ffc1946bf3d2 (patch) | |
| tree | 8eefd42ddd79dfda4b4fb90dada8e2efb082bfb7 /mesonbuild | |
| parent | 3fad3cbb8184c412061ac5543b7f7d73efa4c946 (diff) | |
| download | meson-2c83bd16fc03afd2d8605734dce1ffc1946bf3d2.zip meson-2c83bd16fc03afd2d8605734dce1ffc1946bf3d2.tar.gz meson-2c83bd16fc03afd2d8605734dce1ffc1946bf3d2.tar.bz2 | |
Test targets with only generated and prebuilt objects
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/build.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreterbase.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 5e270a2..106386c 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -327,7 +327,7 @@ class BuildTarget(): for s in objects: if hasattr(s, 'held_object'): s = s.held_object - if isinstance(s, (str, ExtractedObjects)): + if isinstance(s, (str, File, ExtractedObjects)): self.objects.append(s) elif isinstance(s, (GeneratedList, CustomTarget)): msg = 'Generated files are not allowed in the \'objects\' kwarg ' + \ 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: |