summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorchunseoklee <chunseoklee@naver.com>2017-01-17 23:48:00 +0900
committerJan Kotas <jkotas@microsoft.com>2017-01-17 06:48:00 -0800
commit03da0073707c0a4231080e41332838adbc2f3dc0 (patch)
tree3d171f1fbaa4b8ec71fae06b8a0dcb69b6ab2848 /cross
parentc73f3a1a5b2616d039a9bf69803fe9942976410e (diff)
downloadcoreclr-03da0073707c0a4231080e41332838adbc2f3dc0.tar.gz
coreclr-03da0073707c0a4231080e41332838adbc2f3dc0.tar.bz2
coreclr-03da0073707c0a4231080e41332838adbc2f3dc0.zip
Fix armel toolchain setting (#8961)
This PR fixes build fail for armel(debian) Signed-off-by: chunseoklee <chunseok.lee@samsung.com>
Diffstat (limited to 'cross')
-rw-r--r--cross/armel/toolchain.cmake6
1 files changed, 4 insertions, 2 deletions
diff --git a/cross/armel/toolchain.cmake b/cross/armel/toolchain.cmake
index 3154d49d9d..95bff0878b 100644
--- a/cross/armel/toolchain.cmake
+++ b/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)