Unify corerun test runner

src/coreclr/hosts/CMakeLists.txt

@@ -1,9 +1,9 @@
 include_directories(inc)
 
 if(CLR_CMAKE_HOST_WIN32)
-  add_subdirectory(corerun)
   add_subdirectory(coreshim)
 else(CLR_CMAKE_HOST_WIN32)
   add_definitions(-D_FILE_OFFSET_BITS=64)
-  add_subdirectory(unixcorerun)
 endif(CLR_CMAKE_HOST_WIN32)
+
+add_subdirectory(corerun)

src/coreclr/hosts/corerun/CMakeLists.txt

@@ -1,21 +1,35 @@
-project(CoreRun)
+project(corerun)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-add_definitions(-DFX_VER_INTERNALNAME_STR=CoreRun.exe)
 
-_add_executable(CoreRun
-  corerun.cpp logger.cpp
+if(CLR_CMAKE_HOST_WIN32)
+    add_definitions(-DFX_VER_INTERNALNAME_STR=corerun.exe)
+else(CLR_CMAKE_HOST_WIN32)
+    include_directories("${CLR_SRC_NATIVE_DIR}/common")
+    include(configure.cmake)
+endif(CLR_CMAKE_HOST_WIN32)
+
+_add_executable(corerun
+  corerun.cpp
   native.rc
 )
 
-target_link_libraries(CoreRun
-    utilcodestaticnohost
-    advapi32.lib
-    oleaut32.lib
-    uuid.lib
-    user32.lib
-    ${STATIC_MT_CRT_LIB}
-    ${STATIC_MT_VCRT_LIB}
-)
+if(CLR_CMAKE_HOST_WIN32)
+    target_link_libraries(corerun
+        advapi32.lib
+        oleaut32.lib
+        uuid.lib
+        user32.lib
+        ${STATIC_MT_CRT_LIB}
+        ${STATIC_MT_VCRT_LIB}
+    )
+else(CLR_CMAKE_HOST_WIN32)
+    target_link_libraries(corerun ${CMAKE_DL_LIBS})
+
+    # Android implements pthread natively
+    if(NOT CLR_CMAKE_TARGET_ANDROID)
+        target_link_libraries(corerun pthread)
+    endif()
+endif(CLR_CMAKE_HOST_WIN32)
 
-install_clr(TARGETS CoreRun)
+install_clr(TARGETS corerun)