godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82009 from bruvzg/xc15_ld_bug3 

[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
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
methods.py
View File

@ -1080,6 +1080,17 @@ def get_compiler_version(env):
return None
def is_vanilla_clang(env):
if not using_clang(env):
return False
try:
version = decode_utf8(subprocess.check_output([env.subst(env["CXX"]), "--version"]).strip())
except (subprocess.CalledProcessError, OSError):
print("Couldn't parse CXX environment variable to infer compiler version.")
return False
return not version.startswith("Apple")
def using_gcc(env):
return "gcc" in os.path.basename(env["CC"])

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")