Commit 15a0f959 authored by Ghislain MARY's avatar Ghislain MARY

Fix autodetection of build tools for iOS toolchain.

parent f6c684a4
......@@ -48,17 +48,17 @@ message(STATUS "Using sysroot path: ${SYSROOT_PATH}")
set(LINPHONE_BUILDER_TOOLCHAIN_HOST ${COMPILER_PREFIX})
foreach(TOOLNAME clang clang++ ld ar ranlib strip nm)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/toolchains/ios/tool_wrapper.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/${TOOLNAME}.sh)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/toolchains/ios/tool_wrapper.cmake ${CMAKE_CURRENT_BINARY_DIR}/${LINPHONE_BUILDER_TOOLCHAIN_HOST}-${TOOLNAME})
endforeach(TOOLNAME)
set(LINPHONE_BUILDER_TOOLCHAIN_CC "${CMAKE_CURRENT_BINARY_DIR}/clang.sh")
set(LINPHONE_BUILDER_TOOLCHAIN_CXX "${CMAKE_CURRENT_BINARY_DIR}/clang++.sh")
set(LINPHONE_BUILDER_TOOLCHAIN_OBJC "${CMAKE_CURRENT_BINARY_DIR}/clang.sh")
set(LINPHONE_BUILDER_TOOLCHAIN_LD "${CMAKE_CURRENT_BINARY_DIR}/ld.sh")
set(LINPHONE_BUILDER_TOOLCHAIN_AR "${CMAKE_CURRENT_BINARY_DIR}/ar.sh")
set(LINPHONE_BUILDER_TOOLCHAIN_RANLIB "${CMAKE_CURRENT_BINARY_DIR}/ranlib.sh")
set(LINPHONE_BUILDER_TOOLCHAIN_STRIP "${CMAKE_CURRENT_BINARY_DIR}/strip.sh")
set(LINPHONE_BUILDER_TOOLCHAIN_NM "${CMAKE_CURRENT_BINARY_DIR}/nm.sh")
set(LINPHONE_BUILDER_TOOLCHAIN_CC "${CMAKE_CURRENT_BINARY_DIR}/${LINPHONE_BUILDER_TOOLCHAIN_HOST}-clang")
set(LINPHONE_BUILDER_TOOLCHAIN_CXX "${CMAKE_CURRENT_BINARY_DIR}/${LINPHONE_BUILDER_TOOLCHAIN_HOST}-clang++")
set(LINPHONE_BUILDER_TOOLCHAIN_OBJC "${CMAKE_CURRENT_BINARY_DIR}/${LINPHONE_BUILDER_TOOLCHAIN_HOST}-clang")
set(LINPHONE_BUILDER_TOOLCHAIN_LD "${CMAKE_CURRENT_BINARY_DIR}/${LINPHONE_BUILDER_TOOLCHAIN_HOST}-ld")
set(LINPHONE_BUILDER_TOOLCHAIN_AR "${CMAKE_CURRENT_BINARY_DIR}/${LINPHONE_BUILDER_TOOLCHAIN_HOST}-ar")
set(LINPHONE_BUILDER_TOOLCHAIN_RANLIB "${CMAKE_CURRENT_BINARY_DIR}/${LINPHONE_BUILDER_TOOLCHAIN_HOST}-ranlib")
set(LINPHONE_BUILDER_TOOLCHAIN_STRIP "${CMAKE_CURRENT_BINARY_DIR}/${LINPHONE_BUILDER_TOOLCHAIN_HOST}-strip")
set(LINPHONE_BUILDER_TOOLCHAIN_NM "${CMAKE_CURRENT_BINARY_DIR}/${LINPHONE_BUILDER_TOOLCHAIN_HOST}-nm")
if("${PLATFORM}" MATCHES "Simulator")
set(CLANG_TARGET_SPECIFIER "ios-simulator-version-min")
......@@ -83,7 +83,6 @@ set(CMAKE_SYSTEM_PROCESSOR ${SYSTEM_PROCESSOR})
# Define the compiler
CMAKE_FORCE_C_COMPILER(${LINPHONE_BUILDER_TOOLCHAIN_CC} Clang)
CMAKE_FORCE_CXX_COMPILER(${LINPHONE_BUILDER_TOOLCHAIN_CXX} Clang)
set(CMAKE_FIND_ROOT_PATH ${SYSROOT_PATH} ${CMAKE_INSTALL_PREFIX})
......
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