Fix JIT rolling build (dotnet#48552)

Nisden · Feb 20, 2021 · 4d310fb · 4d310fb
1 parent dcacc4d
commit 4d310fb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -126,7 +126,7 @@ if(FEATURE_STANDALONE_GC)
   endif (CLR_CMAKE_BUILD_SUBSET_RUNTIME)
 endif(FEATURE_STANDALONE_GC)
 
-if(NOT CLR_CROSS_COMPONENTS_BUILD)
+if(CLR_CMAKE_BUILD_SUBSET_RUNTIME AND NOT CLR_CROSS_COMPONENTS_BUILD)
   add_subdirectory(${CLR_SRC_NATIVE_DIR}/corehost/apphost/static Corehost.Static)
 endif()
 

diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake
@@ -104,7 +104,6 @@ add_definitions(-DFEATURE_DEFAULT_INTERFACES)
 if(FEATURE_EVENT_TRACE)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:CROSSGEN_COMPONENT>>>:FEATURE_EVENT_TRACE>)
     add_definitions(-DFEATURE_PERFTRACING)
-    add_definitions(-DFEATURE_PERFTRACING_C_LIB)
 else(FEATURE_EVENT_TRACE)
     add_custom_target(eventing_headers) # add a dummy target to avoid checking for FEATURE_EVENT_TRACE in multiple places
 endif(FEATURE_EVENT_TRACE)

diff --git a/src/native/corehost/setup.cmake b/src/native/corehost/setup.cmake
@@ -1,7 +1,7 @@
 # Licensed to the .NET Foundation under one or more agreements.
 # The .NET Foundation licenses this file to you under the MIT license.
 
-if(${CLR_CMAKE_BUILD_SUBSET_RUNTIME})
+if(CLR_CMAKE_BUILD_SUBSET_RUNTIME)
     # CLR partition builds only the single file host where hosting components are all statically linked.
     # the versioning information is irrelevant and may only come up in tracing.
     # so we will use "static"