From cbe22fb5d12ae8014a5cc24c62144e55af12ca9e Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 27 Nov 2012 18:14:59 +0400 Subject: [PATCH] Android: always sort list of NDK toolchains Order returned by CMake is unreliable but we need clang to go after gcc for automatic toolchain selection. --- android/android.toolchain.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake index 25cef0f98..a282207d8 100644 --- a/android/android.toolchain.cmake +++ b/android/android.toolchain.cmake @@ -596,6 +596,9 @@ if( BUILD_WITH_ANDROID_NDK ) endif() if( NOT __availableToolchains ) file( GLOB __availableToolchains RELATIVE "${ANDROID_NDK}/toolchains" "${ANDROID_NDK}/toolchains/*" ) + if( __availableToolchains ) + list(SORT __availableToolchains) # we need clang to go after gcc + endif() __LIST_FILTER( __availableToolchains "^[.]" ) __LIST_FILTER( __availableToolchains "llvm" ) __GLOB_NDK_TOOLCHAINS( __availableToolchains )