[ARM32/Linux] Fix definition and CMake for cross-architecture build (#9262)

- Fix ABI flag based on target
- Exclude corefx for cross-architecture component

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdd8135b5da092dec1e1878c599e33457f2bd776..c9a75e521a41e6a6b52b33d5cd2434434fab904b 100644 (file)
--- a/CMakeLists.txt
+++ b/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/clrdefinitions.cmake b/clrdefinitions.cmake
index a2b920c194eb40a185e5de0d35d12d6a8fbb8499..7f5686afed5aaa969c99abff715445f52d88da7e 100644 (file)
--- a/clrdefinitions.cmake
+++ b/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()