diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0374cfe29e3075b190f7df94b51833ff5b6c6df1..13dcda02f286402e85ec14ed587297c0069dc090 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1015,10 +1015,8 @@ add_subdirectory(runtime)
 enable_testing()
 include(CTest)
 
-# Necessary to compile executables (temporary)
-# should use SystemDetection.cmake module?
-string(REGEX MATCH ".*ifort$" _match_ifort ${CMAKE_Fortran_COMPILER})
-if(_match_ifort)
+# Necessary to compile C executables linked with ifort
+if(${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
     message(STATUS "Add -nofor_main to the Fortran linker (Intel compiler)")
     set(CMAKE_Fortran_FLAGS  "${CMAKE_Fortran_FLAGS} -nofor_main")
 endif(_match_ifort)
diff --git a/hqr b/hqr
index 7ad2afcef2901aa04c772369b3aa0deb4da9158b..621a15b8241717f9e8eb5774eadcb6b6d394e99a 160000
--- a/hqr
+++ b/hqr
@@ -1 +1 @@
-Subproject commit 7ad2afcef2901aa04c772369b3aa0deb4da9158b
+Subproject commit 621a15b8241717f9e8eb5774eadcb6b6d394e99a