From 75eb74f2ddf181ba2378e0e2fa6235991d7cd8e3 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 6 May 2015 15:06:01 -0500 Subject: [PATCH] Fix an apparent typo involved in detecting toolchains. If __availableToolchains is falsish, file( GLOB __availableToolchainsLst ... won't do anything to change that, so the following if statement is always false. --- android.toolchain.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android.toolchain.cmake b/android.toolchain.cmake index 07100ee..30ede4f 100644 --- a/android.toolchain.cmake +++ b/android.toolchain.cmake @@ -598,7 +598,7 @@ if( BUILD_WITH_ANDROID_NDK ) endif() if( NOT __availableToolchains ) file( GLOB __availableToolchainsLst RELATIVE "${ANDROID_NDK_TOOLCHAINS_PATH}" "${ANDROID_NDK_TOOLCHAINS_PATH}/*" ) - if( __availableToolchains ) + if( __availableToolchainsLst ) list(SORT __availableToolchainsLst) # we need clang to go after gcc endif() __LIST_FILTER( __availableToolchainsLst "^[.]" )