aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Filippov <alekseyf@google.com>2018-02-18 02:51:57 +0000
committerJussi Pakkanen <jpakkane@gmail.com>2018-02-27 20:43:02 +0200
commit8c3a1afde07daa25eb93b04f356616793f2a1eb3 (patch)
tree7df4fb15ac717284b8ad2e4589cecbb78c303f39
parentcb176e930313ff652c16ee6001720830ea5964ea (diff)
downloadmeson-8c3a1afde07daa25eb93b04f356616793f2a1eb3.zip
meson-8c3a1afde07daa25eb93b04f356616793f2a1eb3.tar.gz
meson-8c3a1afde07daa25eb93b04f356616793f2a1eb3.tar.bz2
Do not unpack link_whole target, BuildTarget.link_whole() does listify() anyway
-rw-r--r--mesonbuild/build.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index c46a69b..6ed8843 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -658,10 +658,6 @@ just like those detected with the dependency() function.''')
self.link(linktarget)
lwhole = extract_as_list(kwargs, 'link_whole')
for linktarget in lwhole:
- # Sorry for this hack. Keyword targets are kept in holders
- # in kwargs. Unpack here without looking at the exact type.
- if hasattr(linktarget, "held_object"):
- linktarget = linktarget.held_object
self.link_whole(linktarget)
c_pchlist, cpp_pchlist, clist, cpplist, cslist, valalist, objclist, objcpplist, fortranlist, rustlist \