diff options
| author | Frederik Carlier <frederik.carlier@quamotion.mobi> | 2017-03-03 22:16:55 +0100 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-03-03 22:16:55 +0100 |
| commit | 39196d8665e44907ad2a01400940c75f5fde9a25 (patch) | |
| tree | d0e2cec44f4e5c3425f55f4dcdbdcab0a5195a12 /src/pal | |
| parent | d9fae83dc253c23b648f3758b68112c5ff49032a (diff) | |
| download | coreclr-39196d8665e44907ad2a01400940c75f5fde9a25.tar.gz coreclr-39196d8665e44907ad2a01400940c75f5fde9a25.tar.bz2 coreclr-39196d8665e44907ad2a01400940c75f5fde9a25.zip | |
Support local stack unwinding on Android (#9940)
Diffstat (limited to 'src/pal')
| -rw-r--r-- | src/pal/src/CMakeLists.txt | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt index 192c8c0bbb..3ff2fa8cef 100644 --- a/src/pal/src/CMakeLists.txt +++ b/src/pal/src/CMakeLists.txt @@ -291,21 +291,26 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) endif() if(CLR_CMAKE_PLATFORM_ANDROID) + find_library(LZMA NAMES lzma) + + if(LZMA STREQUAL LZMA-NOTFOUND) + message(FATAL_ERROR "Cannot find liblzma.") + endif(LZMA STREQUAL LZMA-NOTFOUND) + target_link_libraries(coreclrpal gnustl_shared android-support - android-glob) + android-glob + ${LZMA}) endif() - if(NOT CLR_CMAKE_PLATFORM_ANDROID) - find_library(UNWIND NAMES unwind) + find_library(UNWIND NAMES unwind) - if(UNWIND STREQUAL UNWIND-NOTFOUND) - message(FATAL_ERROR "Cannot find libunwind. Try installing libunwind8-dev and libunwind8.") - endif(UNWIND STREQUAL UNWIND-NOTFOUND) + if(UNWIND STREQUAL UNWIND-NOTFOUND) + message(FATAL_ERROR "Cannot find libunwind. Try installing libunwind8-dev and libunwind8.") + endif(UNWIND STREQUAL UNWIND-NOTFOUND) - target_link_libraries(coreclrpal ${UNWIND}) - endif() + target_link_libraries(coreclrpal ${UNWIND}) if(CLR_MAKE_PLATFORM_ANDROID) find_library(ANDROID_SUPPORT NAMES android-support) |