Commit 86e76b62 authored by Ghislain MARY's avatar Ghislain MARY

No longer use CMAKE_FORCE_<LANG>_COMPILER in iOS toolchain.

parent 2e231875
......@@ -95,8 +95,14 @@ if(CMAKE_GENERATOR STREQUAL "Xcode")
endif()
# Define the compiler
CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_CC} Clang)
CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_CXX} Clang)
set(CMAKE_C_COMPILER "${TOOLCHAIN_CC}")
set(CMAKE_C_COMPILER_TARGET "${CLANG_TARGET}")
set(CMAKE_CXX_COMPILER "${TOOLCHAIN_CXX}")
set(CMAKE_CXX_COMPILER_TARGET "${CLANG_TARGET}")
set(CMAKE_AR "${TOOLCHAIN_AR}" CACHE FILEPATH "ar")
set(CMAKE_RANLIB "${TOOLCHAIN_RANLIB}" CACHE FILEPATH "ranlib")
set(CMAKE_LINKER "${TOOLCHAIN_LD}" CACHE FILEPATH "linker")
set(CMAKE_NM "${TOOLCHAIN_NM}" CACHE FILEPATH "nm")
set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT} ${CMAKE_INSTALL_PREFIX})
# search for programs in the build host directories
......
......@@ -23,6 +23,7 @@
set(CMAKE_SYSTEM_PROCESSOR "aarch64")
set(LINPHONE_BUILDER_OSX_ARCHITECTURES "arm64")
set(COMPILER_PREFIX "arm64-apple-darwin")
set(CLANG_TARGET "arm64-apple-darwin")
set(PLATFORM "OS")
include("${CMAKE_CURRENT_LIST_DIR}/ios/toolchain-ios.cmake")
......@@ -23,5 +23,6 @@
set(CMAKE_SYSTEM_PROCESSOR "armv7")
set(LINPHONE_BUILDER_OSX_ARCHITECTURES "armv7")
set(COMPILER_PREFIX "armv7-apple-darwin")
set(CLANG_TARGET "armv7-apple-darwin")
set(PLATFORM "OS")
include("${CMAKE_CURRENT_LIST_DIR}/ios/toolchain-ios.cmake")
......@@ -23,6 +23,7 @@
set(CMAKE_SYSTEM_PROCESSOR "i386")
set(LINPHONE_BUILDER_OSX_ARCHITECTURES "i386")
set(COMPILER_PREFIX "i386-apple-darwin")
set(CLANG_TARGET "i386-apple-darwin")
set(PLATFORM "Simulator")
include("${CMAKE_CURRENT_LIST_DIR}/ios/toolchain-ios.cmake")
......@@ -23,6 +23,7 @@
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
set(LINPHONE_BUILDER_OSX_ARCHITECTURES "x86_64")
set(COMPILER_PREFIX "x86_64-apple-darwin")
set(CLANG_TARGET "x86_64-apple-darwin")
set(PLATFORM "Simulator")
include("${CMAKE_CURRENT_LIST_DIR}/ios/toolchain-ios.cmake")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment