Remove unixcoreruncommon static lib dependency

src/coreclr/src/hosts/CMakeLists.txt

@@ -5,6 +5,5 @@ if(CLR_CMAKE_HOST_WIN32)
   add_subdirectory(coreshim)
 else(CLR_CMAKE_HOST_WIN32)
   add_definitions(-D_FILE_OFFSET_BITS=64)
-  add_subdirectory(unixcoreruncommon)
   add_subdirectory(unixcorerun)
 endif(CLR_CMAKE_HOST_WIN32)

src/coreclr/src/hosts/unixcorerun/CMakeLists.txt

@@ -1,34 +1,20 @@
 project(unixcorerun)
 
-include_directories(../unixcoreruncommon)
 include_directories("${CLR_SRC_NATIVE_DIR}/common")
+include(configure.cmake)
 
-set(CORERUN_SOURCES
-    corerun.cpp
-)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 _add_executable(corerun
-    ${CORERUN_SOURCES}
+    corerun.cpp
+    coreruncommon.cpp
 )
 
-# FreeBSD and NetBSD implement dlopen(3) in libc
-if(NOT CLR_CMAKE_TARGET_FREEBSD AND NOT CLR_CMAKE_TARGET_NETBSD)
-    target_link_libraries(corerun
-        dl
-    )
-endif(NOT CLR_CMAKE_TARGET_FREEBSD AND NOT CLR_CMAKE_TARGET_NETBSD)
-
-# Libc turns locks into no-ops if pthread was not loaded into process yet. Loading
-# pthread by the process executable ensures that all locks are initialized properly.
-target_link_libraries(corerun
-    unixcoreruncommon
-)
+target_link_libraries(corerun ${CMAKE_DL_LIBS})
 
 # Android implements pthread natively
 if(NOT CLR_CMAKE_TARGET_ANDROID)
-  target_link_libraries(corerun
-    pthread
-  )
+  target_link_libraries(corerun pthread)
 endif()
 
 install_clr(TARGETS corerun)

src/coreclr/src/hosts/unixcorerun/corerun.cpp

@@ -1,9 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#include <coreruncommon.h>
+#include "coreruncommon.h"
 #include <getexepath.h>
-#include <string>
 #include <string.h>
 #include <sys/stat.h>
 

src/coreclr/src/hosts/unixcoreruncommon/coreruncommon.cpp → src/coreclr/src/hosts/unixcorerun/coreruncommon.cpp

@@ -5,8 +5,6 @@
 // Code that is used by both the Unix corerun and coreconsole.
 //
 
-#include "config.h"
-
 #include <cstdlib>
 #include <cstring>
 #include <assert.h>

src/coreclr/src/hosts/unixcoreruncommon/coreruncommon.h → src/coreclr/src/hosts/unixcorerun/coreruncommon.h

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#include "config.h"
 #include <string>
 
 // Get absolute path from the specified path.