[SCons] Fixed crashes in several scripts

pull/1237/head
DmitriySalnikov 2023-09-09 11:55:53 +03:00
parent 5cdc2fc099
commit 0e5975dd26
5 changed files with 7 additions and 7 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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 = []

View File

@ -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

View File

@ -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