From 0b5202a88b2244b6e5539ca04a6f22b236fe8142 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Thu, 15 Jun 2017 20:36:30 +0200 Subject: [PATCH] Simplify build order settings for "subst" tasks --- waflib/TaskGen.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/waflib/TaskGen.py b/waflib/TaskGen.py index a98b453a..c8d61379 100644 --- a/waflib/TaskGen.py +++ b/waflib/TaskGen.py @@ -865,21 +865,17 @@ def process_subst(self): if not a: raise Errors.WafError('could not find %r for %r' % (x, self)) - has_constraints = False tsk = self.create_task('subst', a, b) for k in ('after', 'before', 'ext_in', 'ext_out'): val = getattr(self, k, None) if val: - has_constraints = True setattr(tsk, k, val) # paranoid safety measure for the general case foo.in->foo.h with ambiguous dependencies - if not has_constraints: - global HEADER_EXTS - for xt in HEADER_EXTS: - if b.name.endswith(xt): - tsk.before = [k for k in ('c', 'cxx') if k in Task.classes] - break + for xt in HEADER_EXTS: + if b.name.endswith(xt): + tsk.ext_in = tsk.ext_in + ['.h'] + break inst_to = getattr(self, 'install_path', None) if inst_to: