diff options
| author | Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com> | 2024-11-14 09:48:34 +0200 |
|---|---|---|
| committer | Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com> | 2024-11-15 12:59:46 +0200 |
| commit | d55ed0cb154f72ca80c725344f91a294f00ca813 (patch) | |
| tree | fee615d2d2f68a63e93fa9d752a0cef129d90dcb /platform | |
| parent | 673f396677654220d7e1d5b6fb5ed3b50126b4e6 (diff) | |
| download | redot-engine-d55ed0cb154f72ca80c725344f91a294f00ca813.tar.gz | |
Buildsystem: Refactor compiler detection code
* Delete old check for gcc 8 as we support 9 or higher
* Flatten branches for clang and apple clang
* Renamed is_vanilla_clang to is_apple_clang to be more clear
Signed-off-by: Yevhen Babiichuk (DustDFG) <dfgdust@gmail.com>
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/macos/detect.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/platform/macos/detect.py b/platform/macos/detect.py index cab91fd33c..3575e93c68 100644 --- a/platform/macos/detect.py +++ b/platform/macos/detect.py @@ -2,7 +2,7 @@ import os 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 methods import detect_darwin_sdk_path, get_compiler_version, is_apple_clang, print_error, print_warning from platform_methods import detect_arch, detect_mvk, validate_arch if TYPE_CHECKING: @@ -101,10 +101,9 @@ def configure(env: "SConsEnvironment"): cc_version = get_compiler_version(env) cc_version_major = cc_version["apple_major"] cc_version_minor = cc_version["apple_minor"] - vanilla = is_vanilla_clang(env) # Workaround for Xcode 15 linker bug. - if not vanilla and cc_version_major == 1500 and cc_version_minor == 0: + if is_apple_clang(env) and cc_version_major == 1500 and cc_version_minor == 0: env.Prepend(LINKFLAGS=["-ld_classic"]) env.Append(CCFLAGS=["-fobjc-arc"]) |