From 0e5975dd266234ab45acbd88168e8550ea3e4419 Mon Sep 17 00:00:00 2001
From: DmitriySalnikov <salnikov.mine@yandex.ru>
Date: Sat, 9 Sep 2023 11:55:53 +0300
Subject: [PATCH] [SCons] Fixed crashes in several scripts

---
 SConstruct          | 1 -
 tools/android.py    | 2 +-
 tools/godotcpp.py   | 7 ++++---
 tools/javascript.py | 2 +-
 tools/macos.py      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/SConstruct b/SConstruct
index 7c652f8f..e8817b07 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,6 @@ import platform
 import sys
 import subprocess
 from binding_generator import scons_generate_bindings, scons_emit_files
-from SCons.Errors import UserError
 
 
 EnsureSConsVersion(4, 0)
diff --git a/tools/android.py b/tools/android.py
index 4735345e..0e688551 100644
--- a/tools/android.py
+++ b/tools/android.py
@@ -29,7 +29,7 @@ def generate(env):
 
     if env["arch"] not in ("arm64", "x86_64", "arm32", "x86_32"):
         print("Only arm64, x86_64, arm32, and x86_32 are supported on Android. Exiting.")
-        Exit()
+        env.Exit(1)
 
     if sys.platform == "win32" or sys.platform == "msys":
         my_spawn.configure(env)
diff --git a/tools/godotcpp.py b/tools/godotcpp.py
index 60cd34b4..969f8c41 100644
--- a/tools/godotcpp.py
+++ b/tools/godotcpp.py
@@ -3,6 +3,7 @@ import os, sys, platform
 from SCons.Variables import EnumVariable, PathVariable, BoolVariable
 from SCons.Tool import Tool
 from SCons.Builder import Builder
+from SCons.Errors import UserError
 
 from binding_generator import scons_generate_bindings, scons_emit_files
 
@@ -226,7 +227,7 @@ def generate(env):
                 env["arch"] = "x86_32"
             else:
                 print("Unsupported CPU architecture: " + host_machine)
-                Exit()
+                env.Exit(1)
 
     print("Building for architecture " + env["arch"] + " on platform " + env["platform"])
 
@@ -284,8 +285,8 @@ def _godot_cpp(env):
     )
     # Forces bindings regeneration.
     if env["generate_bindings"]:
-        AlwaysBuild(bindings)
-        NoCache(bindings)
+        env.AlwaysBuild(bindings)
+        env.NoCache(bindings)
 
     # Sources to compile
     sources = []
diff --git a/tools/javascript.py b/tools/javascript.py
index 42c601d2..1d8009eb 100644
--- a/tools/javascript.py
+++ b/tools/javascript.py
@@ -8,7 +8,7 @@ def exists(env):
 def generate(env):
     if env["arch"] not in ("wasm32"):
         print("Only wasm32 supported on web. Exiting.")
-        Exit()
+        env.Exit(1)
 
     if "EM_CONFIG" in os.environ:
         env["ENV"] = os.environ
diff --git a/tools/macos.py b/tools/macos.py
index 34a755ab..0c75e4a7 100644
--- a/tools/macos.py
+++ b/tools/macos.py
@@ -20,7 +20,7 @@ def exists(env):
 def generate(env):
     if env["arch"] not in ("universal", "arm64", "x86_64"):
         print("Only universal, arm64, and x86_64 are supported on macOS. Exiting.")
-        Exit()
+        env.Exit(1)
 
     if sys.platform == "darwin":
         # Use clang on macOS by default