diff options
| author | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-27 15:58:09 -0700 |
|---|---|---|
| committer | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-27 15:58:09 -0700 |
| commit | 286b3e52b426d0f977fde9e49744ae2f3ffdf990 (patch) | |
| tree | e4f1dc3561d136e855ee1e45b5c66f59b90e2752 /src/jit/linuxnonjit | |
| parent | 57cdf454b123a44ef8d5944f4022b9502ce52d8a (diff) | |
| download | coreclr-286b3e52b426d0f977fde9e49744ae2f3ffdf990.tar.gz coreclr-286b3e52b426d0f977fde9e49744ae2f3ffdf990.tar.bz2 coreclr-286b3e52b426d0f977fde9e49744ae2f3ffdf990.zip | |
Fix Linux/x86 altjit
This is a Linux/x86-targeting, Windows/x86-hosted altjit.
Fix the build so it uses an appropriate gcinfo library, built
with the appropriate defines. Currently, this eliminates a single assert.
Diffstat (limited to 'src/jit/linuxnonjit')
| -rw-r--r-- | src/jit/linuxnonjit/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/jit/linuxnonjit/CMakeLists.txt b/src/jit/linuxnonjit/CMakeLists.txt index eb6f6c145c..6093b88833 100644 --- a/src/jit/linuxnonjit/CMakeLists.txt +++ b/src/jit/linuxnonjit/CMakeLists.txt @@ -14,9 +14,11 @@ if (CLR_CMAKE_PLATFORM_ARCH_I386) remove_definitions(-DFEATURE_HW_INTRINSICS) add_definitions(-DUNIX_X86_ABI) set(JIT_ARCH_ALTJIT_SOURCES ${JIT_I386_SOURCES}) + set(JIT_ARCH_LINK_LIBRARIES gcinfo_linuxx86) elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) add_definitions(-DUNIX_AMD64_ABI) set(JIT_ARCH_ALTJIT_SOURCES ${JIT_AMD64_SOURCES}) + set(JIT_ARCH_LINK_LIBRARIES gcinfo) else() clr_unknown_arch() endif() @@ -38,7 +40,7 @@ set_property(TARGET linuxnonjit APPEND_STRING PROPERTY LINK_DEPENDS ${JIT_EXPORT set(RYUJIT_LINK_LIBRARIES utilcodestaticnohost - gcinfo + ${JIT_ARCH_LINK_LIBRARIES} ) if(CLR_CMAKE_PLATFORM_UNIX) |