diff --git a/CMakeLists.txt b/CMakeLists.txt
index 527b443050..d0360cf800 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,11 +82,15 @@ endif()
 
 option(DISABLE_PACKAGE_CONFIG_AND_INSTALL "Disable package configuration, target export and installation" ${MBEDTLS_AS_SUBPROJECT})
 
-if (CMAKE_C_SIMULATE_ID)
-    set(COMPILER_ID ${CMAKE_C_SIMULATE_ID})
+if (CMAKE_C_COMPILER_ID MATCHES "Clang")
+  if (CMAKE_C_COMPILER_FRONTEND_VARIANT MATCHES "GNU")
+    set(COMPILER_ID "Clang")
+  else()
+    set(COMPILER_ID ${CMAKE_C_COMPILER_FRONTEND_VARIANT})
+  endif()
 else()
-    set(COMPILER_ID ${CMAKE_C_COMPILER_ID})
-endif(CMAKE_C_SIMULATE_ID)
+  set(COMPILER_ID ${CMAKE_C_COMPILER_ID})
+endif()
 
 string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${COMPILER_ID}")
 string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${COMPILER_ID}")