diff --git a/Directory.Build.targets b/Directory.Build.targets
index 7f7454a965662b..fb19adafecf9a9 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -57,6 +57,7 @@
true
+ true
+
+
-
+
+ <_BuildAnyCrossArch Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(EnableNativeSanitizers)' != ''">true
+ <_BuildCrossComponents Condition="$(_subset.Contains('+clr.crossarchtools+'))">true
+ <_BuildCrossComponents Condition="'$(ClrRuntimeBuildSubsets)' != '' and ('$(PrimaryRuntimeFlavor)' == 'CoreCLR' or '$(TargetsMobile)' == 'true')">true
+
+
+
+ <_CrossToolSubset Condition="'$(_BuildCrossComponents)' == 'true'" Include="ClrCrossComponentsSubset=true" />
+ <_CrossToolSubset Condition="'$(BuildHostILTools)' == 'true'" Include="ClrILToolsSubset=true" />
+
+
+
-
+
+
diff --git a/src/coreclr/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.proj b/src/coreclr/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.proj
index 0ee4b7e705fdc8..476a3bfd94c567 100644
--- a/src/coreclr/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.proj
+++ b/src/coreclr/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.proj
@@ -1,4 +1,7 @@
+
+ true
+
diff --git a/src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
index 569b41d95ee09d..c908a523d9d962 100644
--- a/src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
+++ b/src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj
@@ -11,7 +11,8 @@
-
+
+
diff --git a/src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.proj b/src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.proj
index 0ee4b7e705fdc8..476a3bfd94c567 100644
--- a/src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.proj
+++ b/src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.proj
@@ -1,4 +1,7 @@
+
+ true
+
diff --git a/src/coreclr/.nuget/builds.targets b/src/coreclr/.nuget/builds.targets
index e9acb038c46073..2e903bf16bdd21 100644
--- a/src/coreclr/.nuget/builds.targets
+++ b/src/coreclr/.nuget/builds.targets
@@ -17,6 +17,9 @@
<_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == ''" />
+
+ <_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(NETCoreSdkRuntimeIdentifier)'" AdditionalProperties="%(Project.AdditionalProperties);PackCrossComponent=true" />
+
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
index 16308f0dce921e..d010e350397d41 100644
--- a/src/coreclr/CMakeLists.txt
+++ b/src/coreclr/CMakeLists.txt
@@ -75,9 +75,9 @@ endif()
# Include libraries native shims
#-------------------------------
if(NOT CLR_CROSS_COMPONENTS_BUILD)
- set(STATIC_LIBS_ONLY 1)
- add_subdirectory(${CLR_SRC_NATIVE_DIR}/libs libs-native)
-endif(NOT CLR_CROSS_COMPONENTS_BUILD)
+ set(STATIC_LIBS_ONLY 1)
+ add_subdirectory(${CLR_SRC_NATIVE_DIR}/libs libs-native)
+endif()
#-----------------------------------------
# Add Projects