aboutsummaryrefslogtreecommitdiff
path: root/build.py
diff options
context:
space:
mode:
authorHemmo Nieminen <hemmo.nieminen@iki.fi>2015-04-02 13:54:37 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-04-02 14:56:37 +0300
commita3544847ca1414a23d7afe2a77848ea777bba1b0 (patch)
treefeed37b30a6d1535b4e8b11c41489a1d1a0fa901 /build.py
parent9158c42839ba01d144844f4dcd1f633d0405843b (diff)
downloadmeson-a3544847ca1414a23d7afe2a77848ea777bba1b0.zip
meson-a3544847ca1414a23d7afe2a77848ea777bba1b0.tar.gz
meson-a3544847ca1414a23d7afe2a77848ea777bba1b0.tar.bz2
Accept source files in extract_objects() (also) as a list.
Signed-off-by: Hemmo Nieminen <hemmo.nieminen@iki.fi>
Diffstat (limited to 'build.py')
-rw-r--r--build.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/build.py b/build.py
index 89103d5..8efb356 100644
--- a/build.py
+++ b/build.py
@@ -248,14 +248,17 @@ class BuildTarget():
if 'link_with' in self.kwargs:
self.kwargs['link_with'] = self.unpack_holder(self.kwargs['link_with'])
- def extract_objects(self, srclist):
+ def extract_objects(self, srcargs):
obj_src = []
- for src in srclist:
- if not isinstance(src, str):
- raise coredata.MesonException('Extraction arguments must be strings.')
- if src not in self.sources:
- raise coredata.MesonException('Tried to extract unknown source %s.' % src)
- obj_src.append(src)
+ for srclist in srcargs:
+ if not isinstance(srclist, list):
+ srclist = [srclist]
+ for src in srclist:
+ if not isinstance(src, str):
+ raise coredata.MesonException('Extraction arguments must be strings.')
+ if src not in self.sources:
+ raise coredata.MesonException('Tried to extract unknown source %s.' % src)
+ obj_src.append(src)
return ExtractedObjects(self, obj_src)
def get_rpaths(self):