From: Prajwal A N <prajwal.an92@gmail.com>
Date: Wed, 25 May 2016 14:22:57 +0000 (+0900)
Subject: arm-softfp: make toolchain.cmake consistent among different arm archs (dotnet/coreclr... 
X-Git-Tag: submit/tizen/20210909.063632~11030^2~10379
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b9b3c2ddb598cba18d9acb4cdde9694221d0f82;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

arm-softfp: make toolchain.cmake consistent among different arm archs (dotnet/coreclr#5210)

Fixes dotnet/coreclr#5177

Signed-off-by: Prajwal A N <an.prajwal@samsung.com>

Commit migrated from https://github.com/dotnet/coreclr/commit/046085a7bbc924739773576da20951efff194adb
---

diff --git a/src/coreclr/cross/arm-softfp/toolchain.cmake b/src/coreclr/cross/arm-softfp/toolchain.cmake
index 9f02ca2..407ab53 100644
--- a/src/coreclr/cross/arm-softfp/toolchain.cmake
+++ b/src/coreclr/cross/arm-softfp/toolchain.cmake
@@ -20,8 +20,8 @@ add_compile_options(-mfpu=vfpv3)
 add_compile_options(--sysroot=${CROSS_ROOTFS})
 
 set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -target ${TOOLCHAIN}")
-set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
-set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN} -L${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}")
+set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
+set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
 set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}")
 
 set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE)