diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-05 16:48:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-05 16:52:09 (GMT) |
| commit | 5a1a1177bf26a60d51571d7595b868eb03f0dff5 (patch) | |
| tree | e1ad9305298d0d580ef7bc7f405c96e3036a1974 | |
| parent | fca4423786ba2c4a5ab0ec6c1a1cbac8cd8600b4 (diff) | |
| download | CMake-5a1a1177bf26a60d51571d7595b868eb03f0dff5.zip CMake-5a1a1177bf26a60d51571d7595b868eb03f0dff5.tar.gz CMake-5a1a1177bf26a60d51571d7595b868eb03f0dff5.tar.bz2 | |
Android: Update for NDK r16
Since NDK commit 90ec78ffd96b87cd75d82575587ead14d6494df1 (Remove Clang
toolchain path from setup.mk, 2017-05-31) the `setup.mk` files for Clang
no longer hold the path to the `toolchains/llvm` directory. It has been
the same since NDK r11, so use that as the default.
Fixes: #17253
| -rw-r--r-- | Modules/Platform/Android/Determine-Compiler-NDK.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Android/Determine-Compiler-NDK.cmake b/Modules/Platform/Android/Determine-Compiler-NDK.cmake index d983dd6..0649925 100644 --- a/Modules/Platform/Android/Determine-Compiler-NDK.cmake +++ b/Modules/Platform/Android/Determine-Compiler-NDK.cmake @@ -124,7 +124,7 @@ file(STRINGS "${_ANDROID_TOOL_SETUP_MK}" _ANDROID_TOOL_SETUP REGEX "^(LLVM|TOOLC unset(_ANDROID_TOOL_SETUP_MK) set(_ANDROID_TOOL_PREFIX "") set(_ANDROID_TOOL_NAME_ONLY "") -set(_ANDROID_TOOL_LLVM_NAME "") +set(_ANDROID_TOOL_LLVM_NAME "llvm") set(_ANDROID_TOOL_LLVM_VERS "") foreach(line IN LISTS _ANDROID_TOOL_SETUP) if(CMAKE_ANDROID_NDK_TOOLCHAIN_DEBUG) |