diff options
| author | Brad King <brad.king@kitware.com> | 2020-02-03 19:32:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-02-03 19:35:12 (GMT) |
| commit | e3d3b7ddeb5922a4d17b962984e698e6387f7544 (patch) | |
| tree | d28dfe36a09b492d7bcacff970ca49d03e8f8637 | |
| parent | 21e60da5bb0715e09f2feba5930ea2c8bc8180af (diff) | |
| download | CMake-e3d3b7ddeb5922a4d17b962984e698e6387f7544.zip CMake-e3d3b7ddeb5922a4d17b962984e698e6387f7544.tar.gz CMake-e3d3b7ddeb5922a4d17b962984e698e6387f7544.tar.bz2 | |
Android: Fix binutils selection with NDK r19+ unified toolchain
In commit 97bca2f9fa (Android: Use unified toolchain in NDK r19+,
2019-07-26, v3.16.0-rc1~342^2) we hard-coded use of the unified
toolchain for NDK r19+ and skipped most of the old detection logic.
However, in that fast path we left out setting `_CMAKE_TOOLCHAIN_PREFIX`
for `CMakeFindBinutils` to select the matching binutils. Add it.
Fixes: #20038
| -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() |