SCons: Remove `run_in_subprocess` dependency

2 files changed, 3 insertions, 20 deletions

diff --git a/modules/SCsub b/modules/SCsub
index 87c59c3bcc..6fb2aa67f4 100644
--- a/modules/SCsub
+++ b/modules/SCsub
@@ -17,11 +17,7 @@ env.Depends("modules_enabled.gen.h", Value(env.module_list))
 env.CommandNoCache(
     "modules_enabled.gen.h",
     Value(env.module_list),
-    env.Run(
-        modules_builders.generate_modules_enabled,
-        # NOTE: No need to run in subprocess since this is still executed serially.
-        subprocess=False,
-    ),
+    env.Run(modules_builders.generate_modules_enabled),
 )
 
 
@@ -55,11 +51,7 @@ if env["tests"]:
     env.CommandNoCache(
         "modules_tests.gen.h",
         test_headers,
-        env.Run(
-            modules_builders.generate_modules_tests,
-            # NOTE: No need to run in subprocess since this is still executed serially.
-            subprocess=False,
-        ),
+        env.Run(modules_builders.generate_modules_tests),
     )
 
 # libmodules.a with only register_module_types.
diff --git a/modules/modules_builders.py b/modules/modules_builders.py
index 20eea9d993..5db7c88a90 100644
--- a/modules/modules_builders.py
+++ b/modules/modules_builders.py
@@ -1,9 +1,4 @@
-"""Functions used to generate source files during build time
-
-All such functions are invoked in a subprocess on Windows to prevent build flakiness.
-"""
-
-from platform_methods import subprocess_main
+"""Functions used to generate source files during build time"""
 
 
 def generate_modules_enabled(target, source, env):
@@ -18,7 +13,3 @@ def generate_modules_tests(target, source, env):
     with open(target[0].path, "w", encoding="utf-8", newline="\n") as f:
         for header in source:
             f.write('#include "%s"\n' % (os.path.normpath(header.path)))
-
-
-if __name__ == "__main__":
-    subprocess_main(globals())