diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-04 13:26:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-02-04 13:26:39 (GMT) |
| commit | 24d57c2257d7834e5309e80590d3882b29aa8df8 (patch) | |
| tree | a13fb2ba2a065075e9d7df947e8925f7d89b9093 /Modules/Platform | |
| parent | 203abaf0e9e579962174385ca7896705edbc706a (diff) | |
| parent | e3d3b7ddeb5922a4d17b962984e698e6387f7544 (diff) | |
| download | CMake-24d57c2257d7834e5309e80590d3882b29aa8df8.zip CMake-24d57c2257d7834e5309e80590d3882b29aa8df8.tar.gz CMake-24d57c2257d7834e5309e80590d3882b29aa8df8.tar.bz2 | |
Merge topic 'android-ndk-r19-binutils' into release-3.16
e3d3b7ddeb Android: Fix binutils selection with NDK r19+ unified toolchain
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4318
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/Android/Determine-Compiler-NDK.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/Platform/Android/Determine-Compiler-NDK.cmake b/Modules/Platform/Android/Determine-Compiler-NDK.cmake index e009c10..f56e1d5 100644 --- a/Modules/Platform/Android/Determine-Compiler-NDK.cmake +++ b/Modules/Platform/Android/Determine-Compiler-NDK.cmake @@ -23,6 +23,7 @@ if(CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED) set(_ANDROID_TOOL_CXX_COMPILER_EXTERNAL_TOOLCHAIN "") set(_ANDROID_TOOL_CXX_TOOLCHAIN_PREFIX "${CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED}/bin/${CMAKE_ANDROID_ARCH_TRIPLE}-") set(_ANDROID_TOOL_CXX_TOOLCHAIN_SUFFIX "${_ANDROID_HOST_EXT}") + set(_CMAKE_TOOLCHAIN_PREFIX "${CMAKE_ANDROID_ARCH_TRIPLE}-") return() endif() |