diff options
| author | Frederik Carlier <frederik.carlier@quamotion.mobi> | 2017-01-31 00:21:49 +0100 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-01-31 00:21:49 +0100 |
| commit | 55268bf4b98b6e1f202179d9a5ebc876dd154230 (patch) | |
| tree | da57ec58810f4d5e40a95252bb8c7315f443fe42 /src/coreclr | |
| parent | b390ea94d52a9089e24973a12a6413bc8eb9bc3d (diff) | |
| download | coreclr-55268bf4b98b6e1f202179d9a5ebc876dd154230.tar.gz coreclr-55268bf4b98b6e1f202179d9a5ebc876dd154230.tar.bz2 coreclr-55268bf4b98b6e1f202179d9a5ebc876dd154230.zip | |
Support cross-building CoreCLR for arm64 Android (#9173)
* Support cross-building CoreCLR for arm64 Android
* Link gcc_s before libunwind
Diffstat (limited to 'src/coreclr')
| -rw-r--r-- | src/coreclr/hosts/unixcoreconsole/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/coreclr/hosts/unixcorerun/CMakeLists.txt | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt index 8988e60dcf..94587b5374 100644 --- a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt +++ b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt @@ -23,11 +23,16 @@ endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL # pthread by the process executable ensures that all locks are initialized properly. target_link_libraries(coreconsole unixcoreruncommon - pthread ) +if(NOT CLR_CMAKE_PLATFORM_ANDROID) + target_link_libraries(coreconsole + pthread + ) +endif() + add_dependencies(coreconsole coreclr ) -install_clr(coreconsole)
\ No newline at end of file +install_clr(coreconsole) diff --git a/src/coreclr/hosts/unixcorerun/CMakeLists.txt b/src/coreclr/hosts/unixcorerun/CMakeLists.txt index b32c9833bf..b5dc730aaf 100644 --- a/src/coreclr/hosts/unixcorerun/CMakeLists.txt +++ b/src/coreclr/hosts/unixcorerun/CMakeLists.txt @@ -23,11 +23,17 @@ endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL # pthread by the process executable ensures that all locks are initialized properly. target_link_libraries(corerun unixcoreruncommon - pthread ) +# Android implements pthread natively +if(NOT CLR_CMAKE_PLATFORM_ANDROID) + target_link_libraries(corerun + pthread + ) +endif() + add_dependencies(corerun coreclr ) -install_clr(corerun)
\ No newline at end of file +install_clr(corerun) |