diff --git a/platform/server/detect.py b/platform/server/detect.py
index 191034073b8..6fa838df17d 100644
--- 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"])