From c52efadbe6b19e8115c947a4f937669b37d17d20 Mon Sep 17 00:00:00 2001 From: Michael Vincent Date: Fri, 9 Apr 2021 14:29:53 -0500 Subject: [PATCH] gccdeps: Move scan() method Move the scan() method down in the file to match msvcdeps' method ordering. This makes it easier to compare gccdeps.py and msvcdeps.py to keep them in sync. --- waflib/extras/gccdeps.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/waflib/extras/gccdeps.py b/waflib/extras/gccdeps.py index 386a74f8..761b274b 100644 --- a/waflib/extras/gccdeps.py +++ b/waflib/extras/gccdeps.py @@ -29,14 +29,6 @@ if not c_preproc.go_absolute: # Third-party tools are allowed to add extra names in here with append() supported_compilers = ['gas', 'gcc', 'icc', 'clang'] -def scan(self): - if not self.__class__.__name__ in self.env.ENABLE_GCCDEPS: - return super(self.derived_gccdeps, self).scan() - - resolved_nodes = self.generator.bld.node_deps.get(self.uid(), []) - unresolved_names = [] - return (resolved_nodes, unresolved_names) - re_o = re.compile(r"\.o$") re_splitter = re.compile(r'(?