Commit 3a85db32 authored by Ghislain MARY's avatar Ghislain MARY

Really fix autodetection of build tools.

parent 4d432ec2
...@@ -56,16 +56,16 @@ string(REGEX REPLACE "-gcc$" "" LINPHONE_BUILDER_TOOLCHAIN_PATH ${COMPILER_PATH} ...@@ -56,16 +56,16 @@ string(REGEX REPLACE "-gcc$" "" LINPHONE_BUILDER_TOOLCHAIN_PATH ${COMPILER_PATH}
string(REGEX REPLACE "-gcc$" "" LINPHONE_BUILDER_TOOLCHAIN_HOST ${COMPILER_NAME}) string(REGEX REPLACE "-gcc$" "" LINPHONE_BUILDER_TOOLCHAIN_HOST ${COMPILER_NAME})
foreach(TOOLNAME gcc g++ ld ar ranlib strip nm) foreach(TOOLNAME gcc g++ ld ar ranlib strip nm)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/toolchains/bb10/tool_wrapper.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/${TOOLNAME}.sh) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/toolchains/bb10/tool_wrapper.cmake ${CMAKE_CURRENT_BINARY_DIR}/${TOOLNAME})
endforeach(TOOLNAME) endforeach(TOOLNAME)
set(LINPHONE_BUILDER_TOOLCHAIN_CC "${CMAKE_CURRENT_BINARY_DIR}/gcc.sh") set(LINPHONE_BUILDER_TOOLCHAIN_CC "${CMAKE_CURRENT_BINARY_DIR}/gcc")
set(LINPHONE_BUILDER_TOOLCHAIN_CXX "${CMAKE_CURRENT_BINARY_DIR}/g++.sh") set(LINPHONE_BUILDER_TOOLCHAIN_CXX "${CMAKE_CURRENT_BINARY_DIR}/g++")
set(LINPHONE_BUILDER_TOOLCHAIN_LD "${CMAKE_CURRENT_BINARY_DIR}/ld.sh") set(LINPHONE_BUILDER_TOOLCHAIN_LD "${CMAKE_CURRENT_BINARY_DIR}/ld")
set(LINPHONE_BUILDER_TOOLCHAIN_AR "${CMAKE_CURRENT_BINARY_DIR}/ar.sh") set(LINPHONE_BUILDER_TOOLCHAIN_AR "${CMAKE_CURRENT_BINARY_DIR}/ar")
set(LINPHONE_BUILDER_TOOLCHAIN_RANLIB "${CMAKE_CURRENT_BINARY_DIR}/ranlib.sh") set(LINPHONE_BUILDER_TOOLCHAIN_RANLIB "${CMAKE_CURRENT_BINARY_DIR}/ranlib")
set(LINPHONE_BUILDER_TOOLCHAIN_STRIP "${CMAKE_CURRENT_BINARY_DIR}/strip.sh") set(LINPHONE_BUILDER_TOOLCHAIN_STRIP "${CMAKE_CURRENT_BINARY_DIR}/strip")
set(LINPHONE_BUILDER_TOOLCHAIN_NM "${CMAKE_CURRENT_BINARY_DIR}/nm.sh") set(LINPHONE_BUILDER_TOOLCHAIN_NM "${CMAKE_CURRENT_BINARY_DIR}/nm")
set(LINPHONE_BUILDER_TOOLCHAIN_CPPFLAGS "-D_REENTRANT -D__QNXNTO__ -Dasm=__asm") set(LINPHONE_BUILDER_TOOLCHAIN_CPPFLAGS "-D_REENTRANT -D__QNXNTO__ -Dasm=__asm")
set(LINPHONE_BUILDER_TOOLCHAIN_CFLAGS "-fPIC -fstack-protector-strong") set(LINPHONE_BUILDER_TOOLCHAIN_CFLAGS "-fPIC -fstack-protector-strong")
...@@ -82,7 +82,6 @@ set(CMAKE_SYSTEM_PROCESSOR ${SYSTEM_PROCESSOR}) ...@@ -82,7 +82,6 @@ set(CMAKE_SYSTEM_PROCESSOR ${SYSTEM_PROCESSOR})
# Define the compiler # Define the compiler
CMAKE_FORCE_C_COMPILER(${LINPHONE_BUILDER_TOOLCHAIN_CC} GNU) CMAKE_FORCE_C_COMPILER(${LINPHONE_BUILDER_TOOLCHAIN_CC} GNU)
CMAKE_FORCE_CXX_COMPILER(${LINPHONE_BUILDER_TOOLCHAIN_CXX} GNU)
set(CMAKE_FIND_ROOT_PATH ${QNX_TARGET} ${CMAKE_INSTALL_PREFIX}) set(CMAKE_FIND_ROOT_PATH ${QNX_TARGET} ${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