diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2016-11-03 17:58:29 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-11-03 17:58:29 -0700 |
| commit | 3e5eab8392893798ab3a8f3d412829519494f709 (patch) | |
| tree | 3e8e36afaea54ed77d7323def215957e97d26388 | |
| parent | 44fa5027af908c1867379f65f7fae81bf5b91c66 (diff) | |
| download | coreclr-3e5eab8392893798ab3a8f3d412829519494f709.tar.gz coreclr-3e5eab8392893798ab3a8f3d412829519494f709.tar.bz2 coreclr-3e5eab8392893798ab3a8f3d412829519494f709.zip | |
Fix JIT build host/target confusion (#7979)
Also, add RyuJIT to Windows ARM32 cross components build (as protojit.dll).
| -rw-r--r-- | crosscomponents.cmake | 1 | ||||
| -rw-r--r-- | src/jit/dll/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/jit/protojit/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/crosscomponents.cmake b/crosscomponents.cmake index e0d5c1a939..7575570b36 100644 --- a/crosscomponents.cmake +++ b/crosscomponents.cmake @@ -6,4 +6,5 @@ set (CLR_CROSS_COMPONENTS_LIST mscordbi sos clrjit + protojit ) diff --git a/src/jit/dll/CMakeLists.txt b/src/jit/dll/CMakeLists.txt index 01e58dbbb8..fcf869c98f 100644 --- a/src/jit/dll/CMakeLists.txt +++ b/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/jit/protojit/CMakeLists.txt b/src/jit/protojit/CMakeLists.txt index 708c293659..259c7da6b2 100644 --- a/src/jit/protojit/CMakeLists.txt +++ b/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 |