diff options
author | Hyeongseok Oh <hseok82.oh@samsung.com> | 2017-02-09 08:49:23 +0900 |
---|---|---|
committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-02-09 00:49:23 +0100 |
commit | 4f17d5cdd502aee33aecc1669dfd3dcdcb59ca17 (patch) | |
tree | 97c25637c92f54645ccc8ed6f58e460757ef7046 | |
parent | 067c94e3963c73017a167894713825c576bf4b5e (diff) | |
download | coreclr-4f17d5cdd502aee33aecc1669dfd3dcdcb59ca17.tar.gz coreclr-4f17d5cdd502aee33aecc1669dfd3dcdcb59ca17.tar.bz2 coreclr-4f17d5cdd502aee33aecc1669dfd3dcdcb59ca17.zip |
[ARM32/Linux] Fix definition and CMake for cross-architecture build (#9262)
- Fix ABI flag based on target
- Exclude corefx for cross-architecture component
-rw-r--r-- | CMakeLists.txt | 4 | ||||
-rw-r--r-- | clrdefinitions.cmake | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bdd8135b5d..c9a75e521a 100644 --- 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 a2b920c194..7f5686afed 100644 --- 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() |