From 1da291a1e627ded82fadb441f985a16218162e52 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Tue, 7 May 2013 17:49:59 +0200 Subject: [PATCH] Force a fixed order in the link task inputs to prevent unnecessary rebuilds --- waflib/extras/slow_qt4.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/waflib/extras/slow_qt4.py b/waflib/extras/slow_qt4.py index 3ba6a812..82d99b9c 100644 --- a/waflib/extras/slow_qt4.py +++ b/waflib/extras/slow_qt4.py @@ -24,9 +24,9 @@ import waflib.Tools.cxx def cxx_hook(self, node): self.create_compiled_task('cxx_qt', node) -class cxx_qt(waflib.Tools.cxx.cxx): +class cxx_qt(Task.classes['cxx']): def runnable_status(self): - ret = waflib.Tools.cxx.cxx.runnable_status(self) + ret = Task.classes['cxx'].runnable_status(self) if ret != Task.ASK_LATER and not getattr(self, 'moc_done', None): try: @@ -84,6 +84,7 @@ class cxx_qt(waflib.Tools.cxx.cxx): else: link.set_run_after(cxxtsk) link.inputs.extend(cxxtsk.outputs) + link.inputs.sort(key=lambda x: x.abspath()) self.moc_done = True