From d86a66da78a0b81f9e2271417cd6204431467e73 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Wed, 29 May 2013 07:23:20 +0000 Subject: [PATCH] Allow overriding the location of C/C++ compilers in Android CMake build. Patch by Greg Fitzgerald. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182831 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/platforms/Android.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cmake/platforms/Android.cmake b/cmake/platforms/Android.cmake index 72849b16c76..35df5ebd132 100644 --- a/cmake/platforms/Android.cmake +++ b/cmake/platforms/Android.cmake @@ -11,8 +11,15 @@ # make SET(CMAKE_SYSTEM_NAME Linux) -SET(CMAKE_C_COMPILER ${CMAKE_BINARY_DIR}/../bin/clang) -SET(CMAKE_CXX_COMPILER ${CMAKE_BINARY_DIR}/../bin/clang++) + +IF(NOT CMAKE_C_COMPILER) + SET(CMAKE_C_COMPILER ${CMAKE_BINARY_DIR}/../bin/clang) +ENDIF() + +IF(NOT CMAKE_CXX_COMPILER) + SET(CMAKE_CXX_COMPILER ${CMAKE_BINARY_DIR}/../bin/clang++) +ENDIF() + SET(ANDROID "1" CACHE STRING "ANDROID" FORCE) SET(ANDROID_COMMON_FLAGS "-target arm-linux-androideabi --sysroot=${LLVM_ANDROID_TOOLCHAIN_DIR}/sysroot -B${LLVM_ANDROID_TOOLCHAIN_DIR} -mllvm -arm-enable-ehabi") -- 2.34.1