From cf3fe5e3dc14886085e7ffd20d5240cb3a1ed7b1 Mon Sep 17 00:00:00 2001 From: Hyeongseok Oh Date: Thu, 9 Feb 2017 08:49:23 +0900 Subject: [PATCH] [ARM32/Linux] Fix definition and CMake for cross-architecture build (dotnet/coreclr#9262) - Fix ABI flag based on target - Exclude corefx for cross-architecture component Commit migrated from https://github.com/dotnet/coreclr/commit/4f17d5cdd502aee33aecc1669dfd3dcdcb59ca17 --- src/coreclr/CMakeLists.txt | 4 ++-- src/coreclr/clrdefinitions.cmake | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index bdd8135..c9a75e5 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -544,9 +544,9 @@ include(pgosupport.cmake) # - project which require platform header not clr's # - do not depend on clr's compile definitions #----------------------------------------- -if(CLR_CMAKE_PLATFORM_UNIX) +if(CLR_CMAKE_PLATFORM_UNIX AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) add_subdirectory(src/corefx) -endif(CLR_CMAKE_PLATFORM_UNIX) +endif() if(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(src/ToolBox/SOS/lldbplugin) diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index a2b920c..7f5686a 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -53,11 +53,11 @@ if (CLR_CMAKE_PLATFORM_UNIX) add_definitions(-D_XOPEN_SOURCE) endif(CLR_CMAKE_PLATFORM_DARWIN) - if (CLR_CMAKE_PLATFORM_UNIX_AMD64) + if (CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DUNIX_AMD64_ABI) - elseif (CLR_CMAKE_PLATFORM_UNIX_ARM) + elseif (CLR_CMAKE_TARGET_ARCH_ARM) add_definitions(-DUNIX_ARM_ABI) - elseif (CLR_CMAKE_PLATFORM_UNIX_X86) + elseif (CLR_CMAKE_TARGET_ARCH_I386) add_definitions(-DUNIX_X86_ABI) endif() -- 2.7.4