diff options
| author | Petr Bred <bredpetr@gmail.com> | 2018-04-17 04:14:21 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2018-04-16 18:14:21 -0700 |
| commit | da187d302fc28becef4345cd2bb337e8fdabe33e (patch) | |
| tree | d22ffac4cb06847cb334ffb1555fd7f43d35ac90 /cross | |
| parent | 535a4311f5702ecd57090f8fb397932ba5aa5ecf (diff) | |
| download | coreclr-da187d302fc28becef4345cd2bb337e8fdabe33e.tar.gz coreclr-da187d302fc28becef4345cd2bb337e8fdabe33e.tar.bz2 coreclr-da187d302fc28becef4345cd2bb337e8fdabe33e.zip | |
[X86] Fix cross toolchain library paths (#17513)
- fix internal tests building
Signed-off-by: Petr Bred <bredpetr@gmail.com>
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/toolchain.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
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") |