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

Merge pull request #57593 from akien-mga/fix-server-macos-no-static-cpp

This commit is contained in:
Rémi Verschelde 2022-02-04 00:15:49 +01:00 committed by GitHub
parent 8cae6fde0d 94dd9c26dd
commit aa418d06c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/server/detect.py
View File

@ -259,6 +259,12 @@ def configure(env):
if env["execinfo"]:
env.Append(LIBS=["execinfo"])
if platform.system() != "Darwin":
# Link those statically for portability
if env["use_static_cpp"]:
env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"])
if env["use_llvm"] and platform.system() != "FreeBSD":
env["LINKCOM"] = env["LINKCOM"] + " -l:libatomic.a"
else:
if env["use_llvm"] and platform.system() != "FreeBSD":
env.Append(LIBS=["atomic"])