From c198d02e1a3c433f5d580273e1dbc7396d8fcf0a Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Thu, 15 Oct 2015 19:44:21 -0700 Subject: [PATCH] Fix building on darwin-x86_64 with clang Change-Id: I258a707662f90777a4e7c2555f9ba9ee9106fa26 --- android/scripts/common.py | 3 ++- framework/delibs/cmake/toolchain-android-r10e.cmake | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/android/scripts/common.py b/android/scripts/common.py index f9d36b5..888f4de 100644 --- a/android/scripts/common.py +++ b/android/scripts/common.py @@ -213,7 +213,7 @@ NDK_HOST_OS_NAMES = [ "windows", "windows_x86-64", "darwin-x86", - "darwin-x86-64", + "darwin-x86_64", "linux-x86", "linux-x86_64" ] @@ -273,6 +273,7 @@ EXTRA_BUILD_ARGS = getExtraBuildArgs(CMAKE_GENERATOR) # SDK paths ANDROID_SDK_PATH = selectFirstExistingDir([ + os.environ.get("ANDROID_SDK_PATH", None), os.path.expanduser("~/android-sdk-linux"), os.path.expanduser("~/android-sdk-mac_x86"), "C:/android/android-sdk-windows", diff --git a/framework/delibs/cmake/toolchain-android-r10e.cmake b/framework/delibs/cmake/toolchain-android-r10e.cmake index 25fe730..15245d8 100644 --- a/framework/delibs/cmake/toolchain-android-r10e.cmake +++ b/framework/delibs/cmake/toolchain-android-r10e.cmake @@ -144,10 +144,12 @@ elseif (DE_COMPILER STREQUAL "DE_COMPILER_CLANG") if (ANDROID_NDK_HOST_OS STREQUAL "linux-x86" OR ANDROID_NDK_HOST_OS STREQUAL "linux-x86_64" OR - ANDROID_NDK_HOST_OS STREQUAL "darwin-x86") + ANDROID_NDK_HOST_OS STREQUAL "darwin-x86" OR + ANDROID_NDK_HOST_OS STREQUAL "darwin-x86_64") cmake_force_c_compiler("${LLVM_PATH}bin/clang" Clang) cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++" Clang) set(CMAKE_AR "${LLVM_PATH}/bin/llvm-ar" CACHE FILEPATH "Archiver") + set(CMAKE_RANLIB "${CROSS_COMPILE}ranlib" CACHE FILEPATH "Indexer") elseif (ANDROID_NDK_HOST_OS STREQUAL "windows") cmake_force_c_compiler("${LLVM_PATH}bin/clang.exe" Clang) cmake_force_cxx_compiler("${LLVM_PATH}bin/clang++.exe" Clang) -- 2.7.4