From da187d302fc28becef4345cd2bb337e8fdabe33e Mon Sep 17 00:00:00 2001 From: Petr Bred Date: Tue, 17 Apr 2018 04:14:21 +0300 Subject: [X86] Fix cross toolchain library paths (#17513) - fix internal tests building Signed-off-by: Petr Bred --- cross/toolchain.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'cross') diff --git a/cross/toolchain.cmake b/cross/toolchain.cmake index 3504f94a3d..ea8d6cabf8 100644 --- a/cross/toolchain.cmake +++ b/cross/toolchain.cmake @@ -17,6 +17,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(TOOLCHAIN "aarch64-linux-gnu") elseif(TARGET_ARCH_NAME STREQUAL "x86") set(CMAKE_SYSTEM_PROCESSOR i686) + set(TOOLCHAIN "i386-linux-gnu") else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!") endif() @@ -53,6 +54,7 @@ endmacro() # Specify link flags add_compile_param(CROSS_LINK_FLAGS "--sysroot=${CROSS_ROOTFS}") +add_compile_param(CROSS_LINK_FLAGS "-fuse-ld=gold") if(TARGET_ARCH_NAME STREQUAL "armel") add_compile_param(CROSS_LINK_FLAGS "-target ${TOOLCHAIN}") if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only @@ -72,7 +74,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm|arm64)$") add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/lib/${TOOLCHAIN}") else() # x86 case add_compile_param(CROSS_LINK_FLAGS "-B${CROSS_ROOTFS}/usr/lib/gcc/i686-linux-gnu") - add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/lib/i386-linux-gnu") + add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/lib/${TOOLCHAIN}") + add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}") add_compile_param(CROSS_LINK_FLAGS "-m32") endif() add_compile_param(CMAKE_EXE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") -- cgit v1.2.3