From: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
Date: Fri, 11 Sep 2020 19:56:28 +0000 (+0200)
Subject: Fix building JIT without runtime on Linux (#42090)
X-Git-Tag: submit/tizen/20210909.063632~5517
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1d613c5a71ac35283fd79cb9828c601139e69c0;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix building JIT without runtime on Linux (#42090)

* Don't build createdump
* We need mscorrc
---

diff --git a/src/coreclr/src/CMakeLists.txt b/src/coreclr/src/CMakeLists.txt
index 0866be3..1ee527d 100644
--- a/src/coreclr/src/CMakeLists.txt
+++ b/src/coreclr/src/CMakeLists.txt
@@ -15,9 +15,11 @@ endif(CLR_CMAKE_TARGET_WIN32 AND FEATURE_EVENT_TRACE)
 add_subdirectory(debug/dbgutil)
 
 if(CLR_CMAKE_HOST_UNIX)
-  if(CLR_CMAKE_HOST_OSX OR (CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID))
-    add_subdirectory(debug/createdump)
-  endif(CLR_CMAKE_HOST_OSX OR (CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID))
+  if(CLR_CMAKE_BUILD_SUBSET_RUNTIME)
+    if(CLR_CMAKE_HOST_OSX OR (CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID))
+      add_subdirectory(debug/createdump)
+    endif(CLR_CMAKE_HOST_OSX OR (CLR_CMAKE_HOST_LINUX AND NOT CLR_CMAKE_HOST_UNIX_X86 AND NOT CLR_CMAKE_HOST_ANDROID))
+  endif(CLR_CMAKE_BUILD_SUBSET_RUNTIME)
 
   # Include the dummy c++ include files
   include_directories("pal/inc/rt/cpp")
@@ -84,5 +86,12 @@ if (CLR_CMAKE_BUILD_SUBSET_RUNTIME)
   if(CLR_CMAKE_HOST_WIN32)
     add_subdirectory(hosts)
   endif(CLR_CMAKE_HOST_WIN32)
+else()
+  if(CLR_CMAKE_HOST_UNIX)
+    # this is needed to compile the jit on unix platforms.
+    # When the runtime subset is compiled, the add_subdirectory(dlls) above
+    # brings the mscorrc library into the build graph
+    add_subdirectory(dlls/mscorrc)
+  endif(CLR_CMAKE_HOST_UNIX)
 endif(CLR_CMAKE_BUILD_SUBSET_RUNTIME)