Home Explore Help
Register Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

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
Brad King 8 years ago
parent
fca4423786
commit
5a1a1177bf
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      Modules/Platform/Android/Determine-Compiler-NDK.cmake

+ 1 - 1
Modules/Platform/Android/Determine-Compiler-NDK.cmake
View File 

@@ -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)