diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake
index d1f48888092..c5aa2de2721 100644
--- a/cmake/ssl.cmake
+++ b/cmake/ssl.cmake
@@ -29,14 +29,14 @@ MACRO (MYSQL_USE_BUNDLED_SSL)
   CHANGE_SSL_SETTINGS("bundled")
   #Remove -fno-implicit-templates 
   #(yassl sources cannot  be compiled with  it)
-  SET(SAVE_CXX_FLAGS ${CXX_FLAGS})
+  SET(SAVE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
   IF(CMAKE_CXX_FLAGS)
   STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS 
     ${CMAKE_CXX_FLAGS})
   ENDIF()
   ADD_SUBDIRECTORY(extra/yassl)
   ADD_SUBDIRECTORY(extra/yassl/taocrypt)
-  SET(CXX_FLAGS ${SAVE_CXX_FLAGS})
+  SET(CMAKE_CXX_FLAGS ${SAVE_CXX_FLAGS})
   GET_TARGET_PROPERTY(src yassl SOURCES)
   FOREACH(file ${src})
     SET(SSL_SOURCES ${SSL_SOURCES} ${CMAKE_SOURCE_DIR}/extra/yassl/${file})