godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00
Code Releases Wiki Activity

Merge pull request #82009 from bruvzg/xc15_ld_bug3

Browse Source 
[macOS, 3.x] Workaround Xcode 15 linker bug.
This commit is contained in:
Rémi Verschelde
2023-09-20 23:40:17 +02:00
parent 806482db77 fad3fced8f
commit ddba96755f
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/osx/detect.py
View File

@@ -1,6 +1,6 @@
import os
import sys
from methods import detect_darwin_sdk_path
from methods import detect_darwin_sdk_path, get_compiler_version, is_vanilla_clang
def is_active():
@@ -88,6 +88,13 @@ def configure(env):
env.Append(CCFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.13"])
env.Append(LINKFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.13"])
cc_version = get_compiler_version(env) or [-1, -1]
vanilla = is_vanilla_clang(env)
# Workaround for Xcode 15 linker bug.
if not vanilla and cc_version[0] == 15 and cc_version[1] == 0:
env.Prepend(LINKFLAGS=["-ld_classic"])
if not "osxcross" in env: # regular native build
if env["macports_clang"] != "no":
mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local")