summaryrefslogtreecommitdiffstats
path: root/Modules/Platform
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-09-06 14:46:21 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-09-06 14:46:38 (GMT)
commitfaacd46d397b1236c4ddf0d3c46f9139f98b4109 (patch)
tree1c987e3452d29bab892e8c2b4cdec325eeb21bee /Modules/Platform
parent932ba44f075718b4e2896ab86a29be7a0fe0fab9 (diff)
parent5a1a1177bf26a60d51571d7595b868eb03f0dff5 (diff)
downloadCMake-faacd46d397b1236c4ddf0d3c46f9139f98b4109.zip
CMake-faacd46d397b1236c4ddf0d3c46f9139f98b4109.tar.gz
CMake-faacd46d397b1236c4ddf0d3c46f9139f98b4109.tar.bz2
Merge topic 'android-ndk-r16'
5a1a1177 Android: Update for NDK r16 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Daniel Seither <d@fdseither.de> Merge-request: !1237
Diffstat (limited to 'Modules/Platform')
-rw-r--r--Modules/Platform/Android/Determine-Compiler-NDK.cmake2
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)