diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2017-05-11 15:55:28 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2017-05-11 16:59:59 -0700 |
| commit | 410937c08e4eb964d385c467e0044574e1cfe67a (patch) | |
| tree | d080099d2d8ba3dbbc04048663dfd7304df9e6ae | |
| parent | c03744cccb3239a98803debf05b98793a1291aa7 (diff) | |
| download | meson-410937c08e4eb964d385c467e0044574e1cfe67a.zip meson-410937c08e4eb964d385c467e0044574e1cfe67a.tar.gz meson-410937c08e4eb964d385c467e0044574e1cfe67a.tar.bz2 | |
Flatten SharedLibary link_args.
| -rw-r--r-- | mesonbuild/build.py | 4 | ||||
| -rw-r--r-- | test cases/common/150 nested links/meson.build | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 59459bf..c2d4583 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -638,9 +638,7 @@ class BuildTarget(Target): self.vala_gir = kwargs.get('vala_gir', None) dlist = stringlistify(kwargs.get('d_args', [])) self.add_compiler_args('d', dlist) - self.link_args = kwargs.get('link_args', []) - if not isinstance(self.link_args, list): - self.link_args = [self.link_args] + self.link_args = flatten(kwargs.get('link_args', [])) for i in self.link_args: if not isinstance(i, str): raise InvalidArguments('Link_args arguments must be strings.') diff --git a/test cases/common/150 nested links/meson.build b/test cases/common/150 nested links/meson.build index 32cf668..0821b03 100644 --- a/test cases/common/150 nested links/meson.build +++ b/test cases/common/150 nested links/meson.build @@ -4,3 +4,5 @@ libxserver_dri3 = [] libxserver = [ libxserver_dri3 ] executable('Xephyr', 'xephyr.c', link_with: [ libxserver ]) + +executable('Zephyr', 'xephyr.c', link_args: [[], []]) |