From 1783bd8aa5a9c7159ef33d9da110a745dfab65db Mon Sep 17 00:00:00 2001
From: Mats Wichmann <mats@linux.com>
Date: Wed, 7 Feb 2024 11:36:42 -0700
Subject: Restore presub_env behavior in Action

Signed-off-by: Mats Wichmann <mats@linux.com>
---
 SCons/Action.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/SCons/Action.py b/SCons/Action.py
index 1d041c6..5da1f6f 100644
--- a/SCons/Action.py
+++ b/SCons/Action.py
@@ -1254,7 +1254,8 @@ class CommandGeneratorAction(ActionBase):
         try:
             env = self.presub_env
         except AttributeError:
-            import SCons.Defaults  # pylint: disable=import-outside-toplevel
+            env = None
+        if env is None:
             env = SCons.Defaults.DefaultEnvironment()
         act = self._generate([], [], env, 1)
         return str(act)
-- 
cgit v0.12