[llvm] r182831 - Allow overriding the location of C/C++ compilers in Android CMake build.

Evgeniy Stepanov eugeni.stepanov at gmail.com
Wed May 29 00:23:21 PDT 2013


Author: eugenis
Date: Wed May 29 02:23:20 2013
New Revision: 182831

URL: http://llvm.org/viewvc/llvm-project?rev=182831&view=rev
Log:
Allow overriding the location of C/C++ compilers in Android CMake build.

Patch by Greg Fitzgerald.

Modified:
    llvm/trunk/cmake/platforms/Android.cmake

Modified: llvm/trunk/cmake/platforms/Android.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/platforms/Android.cmake?rev=182831&r1=182830&r2=182831&view=diff
==============================================================================
--- llvm/trunk/cmake/platforms/Android.cmake (original)
+++ llvm/trunk/cmake/platforms/Android.cmake Wed May 29 02:23:20 2013
@@ -11,8 +11,15 @@
 # make <target>
 
 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")





More information about the llvm-commits mailing list