Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-02 06:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #85206 from bruvzg/mac_clang_version_check_update

Browse source 
[macOS] Check Apple specific version instead of generic clang version.
This commit is contained in:
Rémi Verschelde 2024-01-18 16:33:39 +01:00
commit 4db2a6801f
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 33 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
platform/macos/detect.py
View file

@ -130,12 +130,12 @@ def configure(env: "Environment"):
env.Append(LINKFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.13"])
cc_version = get_compiler_version(env)
cc_version_major = cc_version["major"]
cc_version_minor = cc_version["minor"]
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 == 15 and cc_version_minor == 0:
if not vanilla and cc_version_major == 1500 and cc_version_minor == 0:
env.Prepend(LINKFLAGS=["-ld_classic"])
env.Append(CCFLAGS=["-fobjc-arc"])