diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2018-08-28 13:35:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 13:35:00 -0700 |
| commit | 1f5c48d10e97fb94aaf66efbfa1e989752a4ee02 (patch) | |
| tree | e8e16b46423149a908d97effe34bffab7fd96862 /src | |
| parent | 7ae2759c7aefad1a0f10fc3debd5cd7d5bfc2765 (diff) | |
| parent | 286b3e52b426d0f977fde9e49744ae2f3ffdf990 (diff) | |
| download | coreclr-1f5c48d10e97fb94aaf66efbfa1e989752a4ee02.tar.gz coreclr-1f5c48d10e97fb94aaf66efbfa1e989752a4ee02.tar.bz2 coreclr-1f5c48d10e97fb94aaf66efbfa1e989752a4ee02.zip | |
Merge pull request #19701 from BruceForstall/FixLinuxNonJitBuild
Fix Linux/x86 altjit
Diffstat (limited to 'src')
| -rw-r--r-- | src/gcinfo/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/gcinfo/gcinfo_linuxx86/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/jit/linuxnonjit/CMakeLists.txt | 4 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/gcinfo/CMakeLists.txt b/src/gcinfo/CMakeLists.txt index ab7e48dcfd..79c4f486da 100644 --- a/src/gcinfo/CMakeLists.txt +++ b/src/gcinfo/CMakeLists.txt @@ -28,6 +28,11 @@ if (CLR_CMAKE_PLATFORM_ARCH_I386) add_subdirectory(gcinfo_arm) endif () +if (CLR_CMAKE_PLATFORM_ARCH_I386 AND WIN32) + # On x86, build Linux x86 cross-compiling altjit. + add_subdirectory(gcinfo_linuxx86) +endif () + if (CLR_CMAKE_PLATFORM_ARCH_AMD64) # On amd64, build RyuJIT/ARM64 cross-compiling altjit. add_subdirectory(gcinfo_arm64) diff --git a/src/gcinfo/gcinfo_linuxx86/CMakeLists.txt b/src/gcinfo/gcinfo_linuxx86/CMakeLists.txt new file mode 100644 index 0000000000..149f493e22 --- /dev/null +++ b/src/gcinfo/gcinfo_linuxx86/CMakeLists.txt @@ -0,0 +1,6 @@ +add_definitions(-DUNIX_X86_ABI) + +add_library_clr(gcinfo_linuxx86 + STATIC + ${GCINFO_SOURCES} +) 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) |