summaryrefslogtreecommitdiffstats
path: root/waftools/generators/sources.py
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2018-07-28 14:48:07 +0200
committerJan Ekström <jeebjp@gmail.com>2019-03-13 21:44:43 +0200
commit92e9b6da71cca2e654aba73e566451d9c682c13b (patch)
tree4b9ebd5461b5f4cc69658696629f63f1a60a458b /waftools/generators/sources.py
parent4fd3af14cd6cd13492cf4af6cfdbd6489de58ab2 (diff)
downloadmpv-92e9b6da71cca2e654aba73e566451d9c682c13b.tar.bz2
mpv-92e9b6da71cca2e654aba73e566451d9c682c13b.tar.xz
build: fix adding of object files to linking with cplugins disabled
this was meant to be fixed by 546f038, but with --disable-cplugins the do_the_symbol_stuff function was never called and the handle_add_object function was again always called before the actual linking task was created. to fix this we explicitly call handle_add_object only after all the tasks the do_the_symbol_stuff function is called after too. Fixes #6028
Diffstat (limited to 'waftools/generators/sources.py')
-rw-r--r--waftools/generators/sources.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/waftools/generators/sources.py b/waftools/generators/sources.py
index d94937c74a..96c8331701 100644
--- a/waftools/generators/sources.py
+++ b/waftools/generators/sources.py
@@ -94,7 +94,7 @@ def __wayland_protocol_header__(ctx, **kwargs):
@TaskGen.feature('cshlib')
@TaskGen.feature('cstlib')
@TaskGen.feature('apply_link')
-@TaskGen.after_method('do_the_symbol_stuff')
+@TaskGen.after_method('process_source', 'process_use', 'apply_link', 'process_uselib_local', 'propagate_uselib_vars', 'do_the_symbol_stuff')
def handle_add_object(tgen):
if getattr(tgen, 'add_object', None):
for input in Utils.to_list(tgen.add_object):