Index: test-suite/trunk/cmake/modules/SingleMultiSource.cmake
===================================================================
--- test-suite/trunk/cmake/modules/SingleMultiSource.cmake
+++ test-suite/trunk/cmake/modules/SingleMultiSource.cmake
@@ -152,7 +152,7 @@
       append_cflags(${source_exename} CXXFLAGS)
       append_ldflags(${source_exename} LDFLAGS)
       llvm_add_test(${name} ${source_exename})
-      add_dependencies(${source_exename} timeit timeit-target fpcmp)
+      add_dependencies(${source_exename} timeit-host timeit-target fpcmp-host)
     endif()
   endforeach()
 endmacro()
@@ -181,7 +181,7 @@
     append_cflags(${source_exename} CXXFLAGS)
     append_ldflags(${source_exename} LDFLAGS)
     llvm_add_test(${PROG} ${source_exename})
-    add_dependencies(${source_exename} timeit timeit-target fpcmp)
+    add_dependencies(${source_exename} timeit-host timeit-target fpcmp-host)
   endif()
   endif()
 endmacro()
Index: test-suite/trunk/tools/CMakeLists.txt
===================================================================
--- test-suite/trunk/tools/CMakeLists.txt
+++ test-suite/trunk/tools/CMakeLists.txt
@@ -9,13 +9,13 @@
 
 set(TEST_SUITE_HOST_CC "cc" CACHE STRING "C compiler targetting the host")
 mark_as_advanced(TEST_SUITE_HOST_CC)
-add_custom_target(fpcmp
+add_custom_target(fpcmp-host
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/fpcmp)
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fpcmp
   COMMAND ${TEST_SUITE_HOST_CC} ${CMAKE_CURRENT_SOURCE_DIR}/fpcmp.c -o ${CMAKE_CURRENT_BINARY_DIR}/fpcmp
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/fpcmp.c
 )
-add_custom_target(timeit
+add_custom_target(timeit-host
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/timeit)
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/timeit
   COMMAND ${TEST_SUITE_HOST_CC} ${CMAKE_CURRENT_SOURCE_DIR}/timeit.c -o ${CMAKE_CURRENT_BINARY_DIR}/timeit