From 2c83bd16fc03afd2d8605734dce1ffc1946bf3d2 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Fri, 9 Dec 2016 13:36:13 +0530 Subject: Test targets with only generated and prebuilt objects --- mesonbuild/build.py | 2 +- mesonbuild/interpreterbase.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild') 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: -- cgit v1.1