diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-10-27 13:25:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-27 13:25:03 +0000 |
| commit | 6e3e9dfb9857b751f59fd4b40c55e9262ff5a864 (patch) | |
| tree | d064b49a4766ab69a0ac6e195868ad4b3443bab3 /platform/macos/detect.py | |
| parent | bec9ffacba1385b0ba808f6dbb66abb7dc53639d (diff) | |
| parent | 953af98c795066a5a450a3401cc8a4fbc6c12620 (diff) | |
| download | redot-engine-6e3e9dfb9857b751f59fd4b40c55e9262ff5a864.tar.gz | |
Merge pull request #814 from Spartan322/merge/61accf0
Merge commit godotengine/godot@61accf0
Diffstat (limited to 'platform/macos/detect.py')
| -rw-r--r-- | platform/macos/detect.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/platform/macos/detect.py b/platform/macos/detect.py index a8968b592e..cab91fd33c 100644 --- a/platform/macos/detect.py +++ b/platform/macos/detect.py @@ -3,7 +3,7 @@ import sys from typing import TYPE_CHECKING from methods import detect_darwin_sdk_path, get_compiler_version, is_vanilla_clang, print_error, print_warning -from platform_methods import detect_arch, detect_mvk +from platform_methods import detect_arch, detect_mvk, validate_arch if TYPE_CHECKING: from SCons.Script.SConscript import SConsEnvironment @@ -68,12 +68,7 @@ def get_flags(): def configure(env: "SConsEnvironment"): # Validate arch. supported_arches = ["x86_64", "arm64"] - if env["arch"] not in supported_arches: - print_error( - 'Unsupported CPU architecture "%s" for macOS. Supported architectures are: %s.' - % (env["arch"], ", ".join(supported_arches)) - ) - sys.exit(255) + validate_arch(env["arch"], get_name(), supported_arches) ## Build type |