Server: Fix skip libstdc++ static linking on macOS

Fixes #48161.
godotengine · Feb 3, 2022 · 94dd9c2 · 94dd9c2
1 parent 8cae6fd
commit 94dd9c2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/platform/server/detect.py b/platform/server/detect.py
@@ -259,6 +259,12 @@ def configure(env):
     if env["execinfo"]:
         env.Append(LIBS=["execinfo"])
 
-    # Link those statically for portability
-    if env["use_static_cpp"]:
-        env.Append(LINKFLAGS=["-static-libgcc", "-static-libstdc++"])
+    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"])