From 546f038ded9427d4bc1e3ea24103f6a8c2783b68 Mon Sep 17 00:00:00 2001 From: Akemi Date: Sun, 1 Jul 2018 01:39:12 +0200 Subject: build: explicitly delay adding of object files to linking Before, `do_the_symbol_stuff` would implicitly come before `handle_add_object`, which adds object files to the linking task. With newer (2.0.x) versions of waf, the ordering seems to get more optimized, and thus we have to declare that the function that creates the linking task should come before the task that adds object files to the task. --- waftools/generators/sources.py | 1 + 1 file changed, 1 insertion(+) (limited to 'waftools') diff --git a/waftools/generators/sources.py b/waftools/generators/sources.py index 5bde478a34..d94937c74a 100644 --- a/waftools/generators/sources.py +++ b/waftools/generators/sources.py @@ -94,6 +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') def handle_add_object(tgen): if getattr(tgen, 'add_object', None): for input in Utils.to_list(tgen.add_object): -- cgit v1.2.3