Fix build for bb10.

configs/config-bb10.cmake

@@ -52,7 +52,7 @@ string(REGEX REPLACE "-gcc$" "" LINPHONE_BUILDER_HOST ${COMPILER_NAME})
 unset(COMPILER_NAME)
 set(LINPHONE_BUILDER_CPPFLAGS "-D_REENTRANT -D__QNXNTO__ -Dasm=__asm")
 set(LINPHONE_BUILDER_CFLAGS "-fPIC -fstack-protector-strong")
-set(LINPHONE_BUILDER_LDFLAGS "-L${QNX_TARGET}/x86/lib -Wl,-z,relro -Wl,-z,now -pie -lbps -lsocket -lslog2")
+set(LINPHONE_BUILDER_LDFLAGS "-Wl,-z,relro -Wl,-z,now -pie -lbps -lsocket -lslog2")
 set(LINPHONE_BUILDER_PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)	# Restrict pkg-config to search in the install directory
 
 
@@ -78,7 +78,7 @@ set(EP_gsm_LINKING_TYPE "-DENABLE_STATIC=YES")
 
 # linphone
 set(EP_linphone_LINKING_TYPE "-DENABLE_STATIC=YES")
-list(APPEND EP_linphone_CMAKE_OPTIONS "-DENABLE_RELATIVE_PREFIX=YES" "-DENABLE_CONSOLE_UI=NO" "-DENABLE_GTK_UI=NO" "-DENABLE_NOTIFY=NO" "-DENABLE_TOOLS=NO" "-DENABLE_TUTORIALS=NO" "-DENABLE_UNIT_TESTS=NO" "-DENABLE_UPNP=NO" "-DMSG_STORAGE_ENABLED")
+list(APPEND EP_linphone_CMAKE_OPTIONS "-DENABLE_RELATIVE_PREFIX=YES" "-DENABLE_CONSOLE_UI=NO" "-DENABLE_GTK_UI=NO" "-DENABLE_NOTIFY=NO" "-DENABLE_TOOLS=NO" "-DENABLE_TUTORIALS=NO" "-DENABLE_UNIT_TESTS=NO" "-DENABLE_UPNP=NO" "-DMSG_STORAGE_ENABLED=YES")
 
 # mediastreamer2
 set(EP_ms2_LINKING_TYPE "-DENABLE_STATIC=YES")

toolchains/bb10/toolchain-bb10.cmake

@@ -80,7 +80,7 @@ set(CMAKE_SYSTEM_PROCESSOR ${SYSTEM_PROCESSOR})
 CMAKE_FORCE_C_COMPILER(${BB10_TOOLCHAIN_CC} GNU)
 CMAKE_FORCE_CXX_COMPILER(${BB10_TOOLCHAIN_CXX} GNU)
 
-set(CMAKE_FIND_ROOT_PATH ${QNX_TARGET} ${CMAKE_INSTALL_PREFIX})
+set(CMAKE_FIND_ROOT_PATH ${QNX_TARGET} ${QNX_TARGET}/${ROOT_PATH_SUFFIX} ${CMAKE_INSTALL_PREFIX})
 
 # search for programs in the build host directories
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

toolchains/toolchain-bb10-arm.cmake

@@ -22,4 +22,5 @@
 
 set(SYSTEM_PROCESSOR arm)
 set(COMPILER_PREFIX "arm-unknown-nto-qnx")
+set(ROOT_PATH_SUFFIX "armle-v7")
 include("${CMAKE_CURRENT_LIST_DIR}/bb10/toolchain-bb10.cmake")

toolchains/toolchain-bb10-i486.cmake

@@ -22,4 +22,5 @@
 
 set(SYSTEM_PROCESSOR i486)
 set(COMPILER_PREFIX "i486-pc-nto-qnx")
+set(ROOT_PATH_SUFFIX "x86")
 include("${CMAKE_CURRENT_LIST_DIR}/bb10/toolchain-bb10.cmake")