diff options
| author | Frederik Carlier <frederik.carlier@quamotion.mobi> | 2017-03-07 23:46:27 +0100 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-03-07 23:46:27 +0100 |
| commit | b7b65a5fe1f893ae308f0984f1169d49c07a24dd (patch) | |
| tree | 546effc67b56d93df383bf65165d7beefd4f2e6f /CMakeLists.txt | |
| parent | 47487b06044e7defc5ba66e096bb207eced03d9a (diff) | |
| download | coreclr-b7b65a5fe1f893ae308f0984f1169d49c07a24dd.tar.gz coreclr-b7b65a5fe1f893ae308f0984f1169d49c07a24dd.tar.bz2 coreclr-b7b65a5fe1f893ae308f0984f1169d49c07a24dd.zip | |
Add scripts for building for arm Android (#9961)
* Add scripts for building for arm Android
* Use arm soft float for bringup
* Use NDK r14
* Set HAVE_PT_REGS to false, as they are not available on Android
* _aligned_alloc is not available on clang
* Detect Visual C++ instead of clang
* Detect Android instead of clang
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b8bc355c7..0e1e623bf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -102,7 +102,7 @@ else (WIN32) # Ensure that objcopy is present if (DEFINED ENV{CROSSCOMPILE} AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) - if (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) + if (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm) find_program(OBJCOPY ${TOOLCHAIN}-objcopy) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686) find_program(OBJCOPY objcopy) @@ -149,6 +149,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l) set(CLR_CMAKE_PLATFORM_UNIX_ARM 1) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL arm) + set(CLR_CMAKE_PLATFORM_UNIX_ARM 1) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64) set(CLR_CMAKE_PLATFORM_UNIX_ARM64 1) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686) |