From c8f8bc2d8998edfea355892daa382439e49b22c5 Mon Sep 17 00:00:00 2001 From: chunseoklee Date: Tue, 17 Jan 2017 23:48:00 +0900 Subject: [PATCH] Fix armel toolchain setting (dotnet/coreclr#8961) This PR fixes build fail for armel(debian) Signed-off-by: chunseoklee Commit migrated from https://github.com/dotnet/coreclr/commit/03da0073707c0a4231080e41332838adbc2f3dc0 --- src/coreclr/cross/armel/toolchain.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/coreclr/cross/armel/toolchain.cmake b/src/coreclr/cross/armel/toolchain.cmake index 3154d49..95bff08 100644 --- a/src/coreclr/cross/armel/toolchain.cmake +++ b/src/coreclr/cross/armel/toolchain.cmake @@ -31,8 +31,10 @@ if("$ENV{__DistroRid}" MATCHES "tizen.*") set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") else() - set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") - set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}") + # TODO: this setting assumes debian armel rootfs + include_directories(SYSTEM ${CROSS_ROOTFS}/usr/include/c++/4.9 ${CROSS_ROOTFS}/usr/include/${TOOLCHAIN}/c++/4.9 ) + set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}/4.9") + set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}/4.9") endif() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE) -- 2.7.4