diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-05 16:54:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-05 16:54:45 (GMT) |
| commit | dfc11d71bdfaff0a901d6432416e1329579782f3 (patch) | |
| tree | e3f4769592ef01a0477aead9ae7d590a69a0b2e1 | |
| parent | 27816fa741560e3668639c0fa054d740de4abc6e (diff) | |
| parent | 5a1a1177bf26a60d51571d7595b868eb03f0dff5 (diff) | |
| download | CMake-dfc11d71bdfaff0a901d6432416e1329579782f3.zip CMake-dfc11d71bdfaff0a901d6432416e1329579782f3.tar.gz CMake-dfc11d71bdfaff0a901d6432416e1329579782f3.tar.bz2 | |
Merge branch 'android-ndk-r16' into release-3.9
Merge-request: !1237
| -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) |