diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-11-15 14:24:07 -0500 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-11-15 14:24:07 -0500 |
| commit | 4a5836e5462554a738b502aa8bbde5e4a051eb56 (patch) | |
| tree | d58eaa8daad3e30c8b84a50e70a21f93b05525c5 /platform/macos/detect.py | |
| parent | ac1a49725fc038ae11ef9060fecb2b0f9c6333b2 (diff) | |
| parent | 6c05ec3d6732cac44cf85c91db7d3fd1075bcb23 (diff) | |
| download | redot-engine-4a5836e5462554a738b502aa8bbde5e4a051eb56.tar.gz | |
Merge commit godotengine/godot@6c05ec3d6732cac44cf85c91db7d3fd1075bcb23
Diffstat (limited to 'platform/macos/detect.py')
| -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"]) |