From 92e9b6da71cca2e654aba73e566451d9c682c13b Mon Sep 17 00:00:00 2001 From: Akemi Date: Sat, 28 Jul 2018 14:48:07 +0200 Subject: 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 --- waftools/generators/sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'waftools') 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): -- cgit v1.2.3