diff --git a/cmake/ConfigureCompiler.cmake b/cmake/ConfigureCompiler.cmake
index e5d33533d1..893752be6f 100644
--- a/cmake/ConfigureCompiler.cmake
+++ b/cmake/ConfigureCompiler.cmake
@@ -189,13 +189,16 @@ else()
     add_compile_options()
     # Clang has link errors unless `atomic` is specifically requested.
     if(NOT APPLE)
-      add_link_options(-latomic)
+      #add_link_options(-latomic)
     endif()
     if (APPLE OR USE_LIBCXX)
       add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-stdlib=libc++>)
       add_compile_definitions(WITH_LIBCXX)
       if (NOT APPLE)
-        add_link_options(-lc++ -lc++abi -Wl,-build-id=sha1)
+        if (STATIC_LINK_LIBCXX)
+          add_link_options(-static-libgcc -nostdlib++  -Wl,-Bstatic -lc++ -lc++abi -Wl,-Bdynamic)
+        endif()
+        add_link_options(-stdlib=libc++ -Wl,-build-id=sha1)
       endif()
     endif()
     if (OPEN_FOR_IDE)