E.g. when Linaro uses "arm-linux-gnueabihf", while OE expects 
"arm-linux-gnueabi" instead.
The links are there to allow OE-built compiler to re-use Linaro-provided 
runtime. When
their TARGET_SYS matches, there's no need for the links.

Signed-off-by: Denys Dmytriyenko <[email protected]>
---
 .../recipes-core/meta/external-linaro-toolchain.bbappend          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend 
b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
index 5f42413..31f5ba0 100644
--- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
+++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
@@ -141,12 +141,16 @@ do_install_append() {
        install -d ${D}/include
        install -d ${D}${includedir}
        cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/include/* ${D}${includedir}
-       ln -sf ${ELT_TARGET_SYS} 
${D}${includedir}/c++/${ELT_VER_GCC}/${TARGET_SYS}
+       if [ ${ELT_TARGET_SYS} != ${TARGET_SYS} ]; then
+               ln -sf ${ELT_TARGET_SYS} 
${D}${includedir}/c++/${ELT_VER_GCC}/${TARGET_SYS}
+       fi
        ln -sf ../usr/include/c++ ${D}/include/c++
 
        install -d ${D}${libdir}/gcc/${TARGET_SYS}/${ELT_VER_GCC}/include
        cp -a 
${TOOLCHAIN_PATH}/${base_libdir}/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include/omp.h
 ${D}${libdir}/gcc/${TARGET_SYS}/${ELT_VER_GCC}/include
-       ln -sf ${TARGET_SYS} ${D}${libdir}/gcc/${ELT_TARGET_SYS}
+       if [ ${ELT_TARGET_SYS} != ${TARGET_SYS} ]; then
+               ln -sf ${TARGET_SYS} ${D}${libdir}/gcc/${ELT_TARGET_SYS}
+       fi
 
        ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 
'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/asm*; rm -rf 
${D}${includedir}/drm; rm -rf ${D}${includedir}/linux; rm -rf 
${D}${includedir}/mtd; rm -rf ${D}${includedir}/rdma; rm -rf 
${D}${includedir}/sound; rm -rf ${D}${includedir}/video', d)}
        ${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 
'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/uapi/.install; rm 
-rf ${D}${includedir}/misc/.install; rm -rf ${D}${includedir}/misc/cxl.h; rm 
-rf ${D}${includedir}/scsi/.install; rm -rf 
${D}${includedir}/scsi/scsi_netlink*; rm -rf ${D}${includedir}/scsi/scsi_bsg*; 
rm -rf ${D}${includedir}/scsi/cxlflash_ioctl.h; rm -rf 
${D}${includedir}/scsi/fc; rm -rf ${D}${includedir}/xen', d)}
-- 
2.7.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to