diff --git a/cmake/system.cmake b/cmake/system.cmake
index fd39017d4..c3a3545ee 100644
--- a/cmake/system.cmake
+++ b/cmake/system.cmake
@@ -616,10 +616,9 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
   endforeach ()
 endif ()
 
-message(STATUS "FC is ${F_COMPILER}")
-if (${F_COMPILER} STREQUAL "NAG" OR ${F_COMPILER} STREQUAL "CRAY" OR ${F_COMPILER} STREQUAL "FLANGNEW")
+if (${F_COMPILER} STREQUAL "NAG" OR ${F_COMPILER} STREQUAL "CRAY" OR CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
   set(FILTER_FLAGS "-msse3;-mssse3;-msse4.1;-mavx;-mavx2,-mskylake-avx512")
-  if ("${F_COMPILER}" STREQUAL "FLANGNEW")
+  if (CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
     set(FILTER_FLAGS "${FILTER_FLAGS};-m32;-m64")
   endif ()
   foreach (FILTER_FLAG ${FILTER_FLAGS})