diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 8cc64089f5a..2ee48177b85 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -113,10 +113,6 @@ TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
 
 MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
 TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
-# Bug in /usr/lib/gcc-snapshot/lib/libstdc++.so ??
-IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "9.0.0")
-  TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup -static-libstdc++)
-ENDIF()
 
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)