diff --git a/platform/server/detect.py b/platform/server/detect.py
index ee77e74ad..02b6b4194 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -234,7 +234,8 @@ def configure(env):
         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"
+                #env["LINKCOM"] = env["LINKCOM"] + " -l:libatomic.a"
+                env["LINKCOM"] = env["LINKCOM"] + " -latomic"
         else:
             if env["use_llvm"] and platform.system() != "FreeBSD":
                 env.Append(LIBS=["atomic"])
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 4156c2ad3..516b786bd 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -374,7 +374,8 @@ def configure(env):
     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"
+            #env["LINKCOM"] = env["LINKCOM"] + " -l:libatomic.a"
+            env["LINKCOM"] = env["LINKCOM"] + " -latomic"
 
     else:
         if env["use_llvm"] and platform.system() != "FreeBSD":