summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2018-07-01 01:39:12 +0200
committerJan Ekström <jeebjp@gmail.com>2018-07-12 01:46:20 +0300
commit546f038ded9427d4bc1e3ea24103f6a8c2783b68 (patch)
tree00c58cd2843052b0b2d669fbf1269798053fd3e2
parent351c083487050c88adb0e3d60f2174850f869018 (diff)
downloadmpv-546f038ded9427d4bc1e3ea24103f6a8c2783b68.tar.bz2
mpv-546f038ded9427d4bc1e3ea24103f6a8c2783b68.tar.xz
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.
-rw-r--r--waftools/generators/sources.py1
1 files changed, 1 insertions, 0 deletions
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):