diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 4d107f9da6..c1b3927b0f 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -553,11 +553,17 @@ if(BUILD_TOOLS)
   install(TARGETS binary2txt DESTINATION ${CMAKE_INSTALL_BINDIR})
 
   include(CheckGeneratorSupport)
-  if(CMAKE_GENERATOR_SUPPORT_FORTRAN AND CMAKE_Fortran_COMPILER)
-    enable_language(Fortran)
-    add_executable(chain.x ${LAMMPS_TOOLS_DIR}/chain.f)
-    target_link_libraries(chain.x PRIVATE ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
-    install(TARGETS chain.x DESTINATION ${CMAKE_INSTALL_BINDIR})
+  if(CMAKE_GENERATOR_SUPPORT_FORTRAN)
+    include(CheckLanguage)
+    check_language(Fortran)
+    if(CMAKE_Fortran_COMPILER)
+      enable_language(Fortran)
+      add_executable(chain.x ${LAMMPS_TOOLS_DIR}/chain.f)
+      target_link_libraries(chain.x PRIVATE ${CMAKE_Fortran_IMPLICIT_LINK_LIBRARIES})
+      install(TARGETS chain.x DESTINATION ${CMAKE_INSTALL_BINDIR})
+    else()
+      message(WARNING "No suitable Fortran compiler found, skipping building 'chain.x'")
+    endif()
   else()
     message(WARNING "CMake build doesn't support fortran, skipping building 'chain.x'")
   endif()
diff --git a/cmake/Modules/FindTBB_MALLOC.cmake b/cmake/Modules/FindTBB_MALLOC.cmake
index 896db649af..776c2c4749 100644
--- a/cmake/Modules/FindTBB_MALLOC.cmake
+++ b/cmake/Modules/FindTBB_MALLOC.cmake
@@ -11,7 +11,8 @@
 # TBB Malloc
 
 find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h PATHS $ENV{TBBROOT}/include)
-find_library(TBB_MALLOC_LIBRARY NAMES tbbmalloc PATHS $ENV{TBBROOT}/lib/intel64/gcc4.7
+find_library(TBB_MALLOC_LIBRARY NAMES tbbmalloc PATHS $ENV{TBBROOT}/lib/intel64/gcc4.8
+                                                      $ENV{TBBROOT}/lib/intel64/gcc4.7
                                                       $ENV{TBBROOT}/lib/intel64/gcc4.4
                                                       $ENV{TBBROOT}/lib/intel64/gcc4.1)