Fix JIT build host/target confusion (dotnet/coreclr#7979)

Also, add RyuJIT to Windows ARM32 cross components build (as protojit.dll).

Commit migrated from https://github.com/dotnet/coreclr/commit/3e5eab8392893798ab3a8f3d412829519494f709

diff --git a/src/coreclr/crosscomponents.cmake b/src/coreclr/crosscomponents.cmake
index e0d5c1a..7575570 100644 (file)
--- a/src/coreclr/crosscomponents.cmake
+++ b/src/coreclr/crosscomponents.cmake
@@ -6,4 +6,5 @@ set (CLR_CROSS_COMPONENTS_LIST
   mscordbi   
   sos
   clrjit
+  protojit
 )  

diff --git a/src/coreclr/src/jit/dll/CMakeLists.txt b/src/coreclr/src/jit/dll/CMakeLists.txt
index 01e58db..fcf869c 100644 (file)
--- a/src/coreclr/src/jit/dll/CMakeLists.txt
+++ b/src/coreclr/src/jit/dll/CMakeLists.txt
@@ -1,8 +1,8 @@
 project(ClrJit)
 
-if(CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM)
+if(CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM)
     add_definitions(-DLEGACY_BACKEND)
-endif(CLR_CMAKE_PLATFORM_ARCH_I386 OR CLR_CMAKE_PLATFORM_ARCH_ARM)
+endif(CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM)
 
 # Disable the following for UNIX altjit on Windows
 if(CLR_CMAKE_PLATFORM_UNIX)

diff --git a/src/coreclr/src/jit/protojit/CMakeLists.txt b/src/coreclr/src/jit/protojit/CMakeLists.txt
index 708c293..259c7da 100644 (file)
--- a/src/coreclr/src/jit/protojit/CMakeLists.txt
+++ b/src/coreclr/src/jit/protojit/CMakeLists.txt
@@ -7,10 +7,10 @@ add_definitions(-DFEATURE_READYTORUN_COMPILER)
 remove_definitions(-DFEATURE_MERGE_JIT_AND_ENGINE)
 
 # Enable SIMD support for RyuJIT/x86.
-if (CLR_CMAKE_PLATFORM_ARCH_I386)
+if (CLR_CMAKE_TARGET_ARCH_I386)
   add_definitions(-DFEATURE_SIMD)
   add_definitions(-DFEATURE_AVX_SUPPORT)
-endif (CLR_CMAKE_PLATFORM_ARCH_I386)
+endif (CLR_CMAKE_TARGET_ARCH_I386)
 
 add_library_clr(protojit
    SHARED