From 7cb7759139c72813df7dc8111c7fc5c739ec09e5 Mon Sep 17 00:00:00 2001
From: Andrew Malachowski <10599712-amalachowski@users.noreply.gitlab.com>
Date: Wed, 31 Aug 2022 11:36:02 +0000
Subject: [PATCH] gccdeps: Harden class wrapping

Explicitly import the asm, C, and CXX modules to ensure the classes
are registered on the Task base class. This hardens the wrapping
logic against failures as the result of incorrect import ordering.
---
 waflib/extras/gccdeps.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/waflib/extras/gccdeps.py b/waflib/extras/gccdeps.py
index 9e9952f2..5d2f0dd2 100644
--- a/waflib/extras/gccdeps.py
+++ b/waflib/extras/gccdeps.py
@@ -17,7 +17,7 @@ Usage::
 
 import os, re, threading
 from waflib import Task, Logs, Utils, Errors
-from waflib.Tools import c_preproc
+from waflib.Tools import asm, c, c_preproc, cxx
 from waflib.TaskGen import before_method, feature
 
 lock = threading.Lock()