diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
index dbe4118eb..3e7bcce59 100644
--- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
+++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
@@ -1,9 +1,6 @@
 include(CheckCCompilerFlag)
 if(CMAKE_CXX_COMPILER)
     include(CheckCXXCompilerFlag)
-    set(ZSTD_CXX_ENABLED TRUE)
-else()
-    set(ZSTD_CXX_ENABLED FALSE)
 endif()
 
 if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.18)
@@ -26,7 +23,7 @@ function(EnableCompilerFlag _flag _C _CXX _LD)
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_flag}" PARENT_SCOPE)
         endif ()
     endif ()
-    if (_CXX AND ZSTD_CXX_ENABLED)
+    if (_CXX AND CMAKE_CXX_COMPILER)
         CHECK_CXX_COMPILER_FLAG(${_flag} CXX_FLAG_${varname})
         if (CXX_FLAG_${varname})
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_flag}" PARENT_SCOPE)