diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9262c5c55..0faf6f7ad3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,10 +187,10 @@ if (OS_LINUX AND COMPILER_CLANG)
     endif ()
 endif ()
 
-if (COMPILER_GCC)
-    set (STATIC_STDLIB_FLAGS "-static-libgcc -static-libstdc++")
-else ()
+if (USE_LIBCXX)
     set (STATIC_STDLIB_FLAGS "")
+else ()
+    set (STATIC_STDLIB_FLAGS "-static-libgcc -static-libstdc++")
 endif ()
 
 if (MAKE_STATIC_LIBRARIES AND NOT APPLE AND NOT (COMPILER_CLANG AND OS_FREEBSD))